--- database.inc	2007-07-12 02:25:47.000000000 -0400
+++ database.inc.fix_setactive	2007-08-17 17:02:23.000000000 -0400
@@ -100,7 +100,7 @@
  */
 function db_set_active($name = 'default') {
   global $db_url, $db_type, $active_db;
-  static $db_conns;
+  static $db_conns, $active_name = 'default';
 
   if (!isset($db_conns[$name])) {
     // Initiate a new connection, using the named DB URL specified.
@@ -128,11 +128,13 @@ function db_set_active($name = 'default'
     $db_conns[$name] = db_connect($connect_url);
   }
 
+  $previous_name = $active_name;
   $previous_db = $active_db;
   // Set the active connection.
+  $active_name = $name;
   $active_db = $db_conns[$name];
 
-  return array_search($previous_db, $db_conns);
+  return $previous_name;
 }
 
 /**