Index: includes/database.mysql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v
retrieving revision 1.31
diff -u -F^f -r1.31 database.mysql.inc
--- includes/database.mysql.inc	22 Jun 2005 20:19:58 -0000	1.31
+++ includes/database.mysql.inc	30 Jul 2005 17:48:53 -0000
@@ -45,22 +45,17 @@ function db_connect($url) {
  * Helper function for db_query().
  */
 function _db_query($query, $debug = 0) {
-  global $active_db;
-  global $queries;
-  static $dev_query;
+  global $active_db, $queries, $conf;
 
-  if (!isset($dev_query)) {
-    $dev_query = function_exists('dev_query') ? variable_get('dev_query', 0) : $GLOBALS['conf']['dev_query'];
-  }
-
-  if ($dev_query) {
+  // can't use variable_get because it may not be present
+  if (isset($conf['dev_query']) && $conf['dev_query']) {
     list($usec, $sec) = explode(' ', microtime());
     $timer = (float)$usec + (float)$sec;
   }
 
   $result = mysql_query($query, $active_db);
 
-  if ($dev_query) {
+  if (isset($conf['dev_query']) && $conf['dev_query']) {
     list($usec, $sec) = explode(' ', microtime());
     $stop = (float)$usec + (float)$sec;
     $diff = $stop - $timer;
Index: includes/database.pgsql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.pgsql.inc,v
retrieving revision 1.9
diff -u -F^f -r1.9 database.pgsql.inc
--- includes/database.pgsql.inc	22 Jun 2005 20:19:58 -0000	1.9
+++ includes/database.pgsql.inc	30 Jul 2005 17:48:53 -0000
@@ -34,22 +34,17 @@ function db_connect($url) {
  * Helper function for db_query().
  */
 function _db_query($query, $debug = 0) {
-  global $active_db, $last_result;
-  global $queries;
+  global $active_db, $last_result, $queries, $conf;
   static $dev_query;
 
-  if (!isset($dev_query)) {
-    $dev_query = function_exists('dev_query') ? variable_get('dev_query', 0) : $GLOBALS['conf']['dev_query'];
-  }
-
-  if ($dev_query) {
+  if (isset($conf['dev_query']) && $conf['dev_query']) {
     list($usec, $sec) = explode(' ', microtime());
     $timer = (float)$usec + (float)$sec;
   }
 
   $last_result = pg_query($active_db, $query);
 
-  if ($dev_query) {
+  if (isset($conf['dev_query']) && $conf['dev_query']) {
     list($usec, $sec) = explode(' ', microtime());
     $stop = (float)$usec + (float)$sec;
     $diff = $stop - $timer;