Ticket #17188: 17188.patch

wp-admin/includes/upgrade.php

@@ -459 +459 @@
         if ( $wp_current_db_version < 19389 )
                 upgrade_330();
 
+        if ( $wp_current_db_version < 19793 )
+                upgrade_340();
+
         maybe_disable_automattic_widgets();
 
         update_option( 'db_version', $wp_db_version );
@@ -1214 +1217 @@
 }
 
 /**
+ * Execute changes made in WordPress 3.4.
+ *
+ * @since 3.4.0
+ */
+function upgrade_340() {
+        global $wp_current_db_version, $wpdb;
+
+        $wpdb->hide_errors();
+        $wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
+        $wpdb->show_errors();
+}       
+        
+/**
  * Execute network level changes
  *
  * @since 3.0.0