Ticket #19935: 19935.2.diff

wp-includes/version.php

@@ -11 +11 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 19798;
+$wp_db_version = 19799;
 
 /**
  * Holds the TinyMCE version

wp-admin/includes/upgrade.php

@@ -459 +459 @@
         if ( $wp_current_db_version < 19389 )
                 upgrade_330();
 
-        if ( $wp_current_db_version < 19793 )
+        if ( $wp_current_db_version < 19799 )
                 upgrade_340();
 
         maybe_disable_automattic_widgets();
@@ -1224 +1224 @@
 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();
-}       
-        
+        if ( $wp_current_db_version < 19798 ) {
+                $wpdb->hide_errors();
+                $wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
+                $wpdb->show_errors();
+        }
+}
+
 /**
  * Execute network level changes
  *

wp-admin/includes/schema.php

@@ -103 +103 @@
   comment_parent bigint(20) unsigned NOT NULL default '0',
   user_id bigint(20) unsigned NOT NULL default '0',
   PRIMARY KEY  (comment_ID),
-  KEY comment_approved (comment_approved),
   KEY comment_post_ID (comment_post_ID),
   KEY comment_approved_date_gmt (comment_approved,comment_date_gmt),
   KEY comment_date_gmt (comment_date_gmt),