Ticket #2699: 2699.2.diff

wp-includes/version.php

@@ -15 +15 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 11548;
+$wp_db_version = 11557;
 
 /**
  * Holds the TinyMCE version

wp-admin/includes/upgrade.php

@@ -269 +269 @@
 
         wp_check_mysql_version();
         wp_cache_flush();
+        pre_schema_upgrade();
         make_db_current_silent();
         upgrade_all();
         wp_cache_flush();
@@ -1656 +1657 @@
         }
 }
 
-?>
+/**
+ * Runs before the schema is upgraded.
+ */
+function pre_schema_upgrade() {
+        global $wp_current_db_version, $wp_db_version, $wpdb;
+
+        // Only run if less than 2.9
+        if ( $wp_current_db_version >= 11557 )
+                return;
+
+        // Delete duplicate options.  Keep the option with the highest option_id.
+        $delete_options = $wpdb->get_col("SELECT o1.option_id FROM wp_options AS o1 JOIN wp_options AS o2 ON o2.option_name = o1.option_name AND o2.option_id > o1.option_id");
+        if ( empty($delete_options) )
+                return;
+
+        $delete_options = implode("', '", $delete_options);
+        $wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($delete_options)");
+}
+
+?>
+ No newline at end of file

wp-admin/includes/schema.php

@@ -100 +100 @@
   option_value longtext NOT NULL,
   autoload varchar(20) NOT NULL default 'yes',
   PRIMARY KEY  (option_id,blog_id,option_name),
-  KEY option_name (option_name)
+  UNIQUE KEY name (option_name)
 ) $charset_collate;
 CREATE TABLE $wpdb->postmeta (
   meta_id bigint(20) unsigned NOT NULL auto_increment,