Index: includes/database.mysqli.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysqli.inc,v
retrieving revision 1.37
diff -u -r1.37 database.mysqli.inc
--- includes/database.mysqli.inc	25 May 2007 21:01:30 -0000	1.37
+++ includes/database.mysqli.inc	26 May 2007 21:18:40 -0000
@@ -242,11 +242,10 @@
  * with table prefixes. For example, db_next_id('{node}_nid');
  */
 function db_next_id($name) {
-  global $active_db;
   $name = db_prefix_tables($name);
   db_query('INSERT INTO {sequences} VALUES ("%s", LAST_INSERT_ID(1)) ON DUPLICATE KEY UPDATE id = LAST_INSERT_ID(id + 1)', $name);
 
-  return mysqli_insert_id($active_db);
+  return db_result(db_query('SELECT LAST_INSERT_ID()'));
 }
 
 /**
Index: includes/database.mysql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v
retrieving revision 1.73
diff -u -r1.73 database.mysql.inc
--- includes/database.mysql.inc	25 May 2007 21:01:30 -0000	1.73
+++ includes/database.mysql.inc	26 May 2007 21:18:40 -0000
@@ -250,11 +250,10 @@
  * with table prefixes. For example, db_next_id('{node}_nid');
  */
 function db_next_id($name) {
-  global $active_db;
   $name = db_prefix_tables($name);
   db_query('INSERT INTO {sequences} VALUES ("%s", LAST_INSERT_ID(1)) ON DUPLICATE KEY UPDATE id = LAST_INSERT_ID(id + 1)', $name);
 
-  return mysql_insert_id($active_db);
+  return db_result(db_query('SELECT LAST_INSERT_ID()'));
 }
 
 /**