Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.186.2.1
diff -u -p -r1.186.2.1 update.php
--- update.php	18 Oct 2006 20:14:41 -0000	1.186.2.1
+++ update.php	21 Nov 2006 02:59:49 -0000
@@ -215,7 +215,7 @@ function update_fix_sessions() {
   $ret = array();
 
   if (drupal_get_installed_schema_version('system') < 130 && !variable_get('update_sessions_fixed', FALSE)) {
-    if ($GLOBALS['db_type'] == 'mysql') {
+    if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
       db_query("ALTER TABLE {sessions} ADD cache int(11) NOT NULL default '0' AFTER timestamp");
     }
     elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -235,7 +235,7 @@ function update_fix_sessions() {
  */
 function update_fix_watchdog_115() {
   if (drupal_get_installed_schema_version('system') < 115 && !variable_get('update_watchdog_115_fixed', FALSE)) {
-    if ($GLOBALS['db_type'] == 'mysql') {
+    if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
       $ret[] = update_sql("ALTER TABLE {watchdog} ADD severity tinyint(3) unsigned NOT NULL default '0'");
     }
     else if ($GLOBALS['db_type'] == 'pgsql') {
Index: database/updates.inc
===================================================================
RCS file: /cvs/drupal/drupal/database/Attic/updates.inc,v
retrieving revision 1.224.2.6
diff -u -p -r1.224.2.6 updates.inc
--- database/updates.inc	8 Jun 2006 21:25:50 -0000	1.224.2.6
+++ database/updates.inc	21 Nov 2006 03:01:26 -0000
@@ -5,7 +5,7 @@ function system_update_110() {
   $ret = array();
 
   // TODO: needs PGSQL version
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     /*
     ** Search
     */
@@ -90,7 +90,7 @@ function system_update_111() {
 
   $ret[] = update_sql("DELETE FROM {variable} WHERE name LIKE 'throttle_%'");
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql('ALTER TABLE {sessions} ADD PRIMARY KEY sid (sid)');
   }
   elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -103,7 +103,7 @@ function system_update_111() {
 function system_update_112() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("CREATE TABLE {flood} (
       event varchar(64) NOT NULL default '',
       hostname varchar(128) NOT NULL default '',
@@ -124,7 +124,7 @@ function system_update_112() {
 function system_update_113() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql('ALTER TABLE {accesslog} ADD aid int(10) NOT NULL auto_increment, ADD PRIMARY KEY (aid)');
   }
   elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -154,7 +154,7 @@ function system_update_113() {
 
 function system_update_114() {
   $ret = array();
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("CREATE TABLE {queue} (
       nid int(10) unsigned NOT NULL,
       uid int(10) unsigned NOT NULL,
@@ -196,7 +196,7 @@ function system_update_114() {
     }
   }
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     // Postgres only supports dropping of columns since 7.4
     $ret[] = update_sql("ALTER TABLE {node} DROP votes");
     $ret[] = update_sql("ALTER TABLE {node} DROP score");
@@ -221,7 +221,7 @@ function system_update_116() {
 
 function system_update_117() {
   $ret = array();
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("CREATE TABLE {vocabulary_node_types} (
                          vid int(10) NOT NULL default '0',
                          type varchar(16) NOT NULL default '',
@@ -248,7 +248,7 @@ function system_update_118() {
       db_query("INSERT INTO {vocabulary_node_types} (vid, type) VALUES (%d, '%s')", $vid, $type);
     }
   }
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {vocabulary} DROP nodes");
   }
   return $ret;
@@ -321,7 +321,7 @@ function system_update_122() {
 function system_update_123() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {vocabulary} ADD module varchar(255) NOT NULL default ''");
   }
   elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -343,7 +343,7 @@ function system_update_123() {
 function system_update_124() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     // redo update_105, correctly creating node_comment_statistics
     $ret[] = update_sql("DROP TABLE IF EXISTS {node_comment_statistics}");
 
@@ -420,7 +420,7 @@ function system_update_127() {
   if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql("ALTER TABLE {poll} RENAME voters TO polled");
   }
-  else if ($GLOBALS['db_type'] == 'mysql') {
+  else if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {poll} CHANGE voters polled longtext");
   }
   return $ret;
@@ -429,7 +429,7 @@ function system_update_127() {
 function system_update_128() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql('ALTER TABLE {term_node} ADD PRIMARY KEY (tid,nid)');
   }
   elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -442,7 +442,7 @@ function system_update_128() {
 function system_update_129() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {vocabulary} ADD tags tinyint(3) unsigned default '0' NOT NULL");
   }
   elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -464,7 +464,7 @@ function system_update_130() {
 function system_update_131() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {boxes} DROP INDEX title");
     // Removed recreation of the index, which is not present in the db schema
   }
@@ -505,7 +505,7 @@ function system_update_132() {
 function system_update_133() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("CREATE TABLE {contact} (
       subject varchar(255) NOT NULL default '',
       recipients longtext NOT NULL default '',
@@ -566,7 +566,7 @@ function system_update_137() {
   $ret = array();
 
   if (!variable_get('update_137_done', FALSE)) {
-    if ($GLOBALS['db_type'] == 'mysql') {
+    if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
       $ret[] = update_sql("ALTER TABLE {locales_source} CHANGE location location varchar(255) NOT NULL default ''");
     }
     elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -603,7 +603,7 @@ function system_update_139() {
 function system_update_140() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {url_alias} ADD INDEX (src)");
   }
   elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -632,7 +632,7 @@ function system_update_142() {
 function system_update_143() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {contact} CHANGE subject category VARCHAR(255) NOT NULL ");
     $ret[] = update_sql("ALTER TABLE {contact} ADD PRIMARY KEY (category)");
   }
@@ -650,7 +650,7 @@ function system_update_143() {
 
 function system_update_144() {
   $ret = array();
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {node} CHANGE type type VARCHAR(32) NOT NULL");
   }
   elseif ($GLOBALS['db_type'] == 'pgsql') {
@@ -707,7 +707,7 @@ function system_update_145() {
 function system_update_146() {
   $ret = array();
 
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("CREATE TABLE {node_revisions}
                                 SELECT nid, nid AS vid, uid, type, title, body, teaser, changed AS timestamp, format
                                 FROM {node}");
@@ -808,7 +808,7 @@ function system_update_147() {
   $ret = array();
 
   // this update is mysql only, pgsql should get it right in the first try.
-  if ($GLOBALS['db_type'] == 'mysql') {
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
     $ret[] = update_sql("ALTER TABLE {node_revisions} DROP type");
   }