Index: includes/update.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/update.inc,v
retrieving revision 1.33
diff -u -p -r1.33 update.inc
--- includes/update.inc   4 Feb 2010 05:10:00 -0000   1.33
+++ includes/update.inc   4 Feb 2010 15:58:19 -0000
@@ -271,16 +271,15 @@ function update_fix_d7_requirements() {
     db_change_field('system', 'schema_version', 'schema_version', array(
      'type' => 'int',
      'size' => 'small',
-     'length' => 6,
      'not null' => TRUE,
      'default' => -1)
     );
     db_change_field('system', 'status', 'status', array(
-      'type' => 'int', 'length' => 11, 'not null' => TRUE, 'default' => 0));
+      'type' => 'int', 'not null' => TRUE, 'default' => 0));
     db_change_field('system', 'weight', 'weight', array(
-      'type' => 'int', 'length' => 11, 'not null' => TRUE, 'default' => 0));
+      'type' => 'int', 'not null' => TRUE, 'default' => 0));
     db_change_field('system', 'bootstrap', 'bootstrap', array(
-      'type' => 'int', 'length' => 11, 'not null' => TRUE, 'default' => 0));
+      'type' => 'int', 'not null' => TRUE, 'default' => 0));
     // Drop and recreate 6.x indexes.
     db_drop_index('system', 'bootstrap');
     db_add_index('system', 'bootstrap', array(
@@ -484,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
+    // @todo remove this later in a system update
+    if (db_table_exists('queue')) {
+      db_rename_table('queue', 'queue_old');
+    }
     // Add the queue table.
     $schema['queue'] = array(
       'description' => 'Stores items in queues.',
@@ -529,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
+    // @todo remove this later in a system update
+    if (db_table_exists('sequences')) {
+      db_rename_table('sequences', 'sequences_old');
+    }
     // Create the sequences table.
     $schema['sequences'] = array(
       'description' => 'Stores IDs.',