Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.88
diff -u -p -r1.88 bootstrap.inc
--- includes/bootstrap.inc	27 Feb 2006 13:46:01 -0000	1.88
+++ includes/bootstrap.inc	24 Mar 2006 18:38:00 -0000
@@ -590,7 +590,14 @@ function request_uri() {
  */
 function watchdog($type, $message, $severity = WATCHDOG_NOTICE, $link = NULL) {
   global $user;
+
+  $current_db = db_set_active();
+
   db_query("INSERT INTO {watchdog} (uid, type, message, severity, link, location, referer, hostname, timestamp) VALUES (%d, '%s', '%s', %d, '%s', '%s', '%s', '%s', %d)", $user->uid, $type, $message, $severity, $link, request_uri(), referer_uri(), $_SERVER['REMOTE_ADDR'], time());
+
+  if ($current_db) {
+    db_set_active($current_db);
+  }
 }
 
 /**
Index: includes/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.inc,v
retrieving revision 1.51
diff -u -p -r1.51 database.inc
--- includes/database.inc	8 Mar 2006 15:13:20 -0000	1.51
+++ includes/database.inc	24 Mar 2006 18:38:01 -0000
@@ -95,6 +95,8 @@ function db_prefix_tables($sql) {
  * @param $name
  *   The name assigned to the newly active database connection. If omitted, the
  *   default connection will be made active.
+ *
+ * @return the name of the 
  */
 function db_set_active($name = 'default') {
   global $db_url, $db_type, $active_db;
@@ -110,7 +112,7 @@ function db_set_active($name = 'default'
     }
 
     $db_type = substr($connect_url, 0, strpos($connect_url, '://'));
-   $handler = "./includes/database.$db_type.inc";
+    $handler = "./includes/database.$db_type.inc";
 
     if (is_file($handler)) {
       include_once $handler;
@@ -124,10 +126,13 @@ function db_set_active($name = 'default'
     }
 
     $db_conns[$name] = db_connect($connect_url);
-
   }
+
+  $previous_db = $active_db;
   // Set the active connection.
   $active_db = $db_conns[$name];
+
+  return array_search($previousdb, $db_conns);
 }
 
 /**