Index: includes/database.mysql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v
retrieving revision 1.32
diff -u -F^f -r1.32 database.mysql.inc
--- includes/database.mysql.inc	27 Jul 2005 01:58:43 -0000	1.32
+++ includes/database.mysql.inc	30 Jul 2005 16:05:35 -0000
@@ -77,7 +77,7 @@ function _db_query($query, $debug = 0) {
   static $dev_query;
 
   if (!isset($dev_query)) {
-    $dev_query = function_exists('dev_query') ? variable_get('dev_query', 0) : $GLOBALS['conf']['dev_query'];
+    $dev_query = function_exists('dev_query') ? variable_get('dev_query', 0) : (isset($GLOBALS['conf']['dev_query']) ? $GLOBALS['conf']['dev_query'] : NULL);
   }
 
   if ($dev_query) {
Index: includes/database.pgsql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.pgsql.inc,v
retrieving revision 1.10
diff -u -F^f -r1.10 database.pgsql.inc
--- includes/database.pgsql.inc	27 Jul 2005 01:58:43 -0000	1.10
+++ includes/database.pgsql.inc	30 Jul 2005 16:05:35 -0000
@@ -64,7 +64,7 @@ function _db_query($query, $debug = 0) {
   static $dev_query;
 
   if (!isset($dev_query)) {
-    $dev_query = function_exists('dev_query') ? variable_get('dev_query', 0) : $GLOBALS['conf']['dev_query'];
+    $dev_query = function_exists('dev_query') ? variable_get('dev_query', 0) : (isset($GLOBALS['conf']['dev_query']) ? $GLOBALS['conf']['dev_query'] : NULL);
   }
 
   if ($dev_query) {