Index: includes/update.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/update.inc,v
retrieving revision 1.34
diff -u -p -r1.34 update.inc
--- includes/update.inc   4 Feb 2010 17:03:19 -0000   1.34
+++ includes/update.inc   6 Feb 2010 01:54:41 -0000
@@ -483,6 +483,12 @@ function update_fix_d7_requirements() {
     db_create_table('date_formats', $schema['date_formats']);
     db_create_table('date_format_locale', $schema['date_format_locale']);
 
+    // Check for queue table, if found rename it, it has a different
+    // schema than D7 but could be useful for upgrading modules.
+    if (db_table_exists('queue')) {
+      db_rename_table('queue', 'queue_old');
+    }
+
     // Add the queue table.
     $schema['queue'] = array(
       'description' => 'Stores items in queues.',
@@ -528,6 +534,12 @@ function update_fix_d7_requirements() {
     );
     db_create_table('queue', $schema['queue']);
 
+    // Check for sequences table, if found rename it, it has a different
+    // schema than D7 but could be useful for upgrading modules.
+    if (db_table_exists('sequences')) {
+      db_rename_table('sequences', 'sequences_old');
+    }
+
     // Create the sequences table.
     $schema['sequences'] = array(
       'description' => 'Stores IDs.',
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.445
diff -u -p -r1.445 system.install
--- modules/system/system.install   3 Feb 2010 18:16:23 -0000   1.445
+++ modules/system/system.install   6 Feb 2010 02:30:06 -0000
@@ -1610,9 +1610,7 @@ function system_update_6052() {
  * Add a {system} index on type and name.
  */
 function system_update_6053() {
-  $ret = array();
-  db_add_index($ret, 'system', 'type_name', array(array('type', 12), 'name'));
-  return $ret;
+  // Update moved to update_fix_d7_requirements().
 }
 
 /**
@@ -2004,11 +2002,7 @@ function system_update_7017() {
  * Shorten the {system}.type column and modify indexes.
  */
 function system_update_7018() {
-  db_drop_index('system', 'modules');
-  db_drop_index('system', 'type_name');
-  db_change_field('system', 'type', 'type', array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => ''));
-  db_add_index('system', 'type_name', array('type', 'name'));
-  db_add_index('system', 'system_list', array('weight', 'name'));
+  // Update moved to update_fix_d7_requirements().
 }
 
 /**