Ticket #26858: 26858.2.diff

src/wp-admin/includes/schema.php

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

src/wp-admin/includes/upgrade.php

@@ -538 +538 @@
         if ( $wp_current_db_version < 33056 )
                 upgrade_431();
 
-        if ( $wp_current_db_version < 34030 )
+        if ( $wp_current_db_version < 34529 )
                 upgrade_440();
 
         maybe_disable_link_manager();
@@ -1612 +1612 @@
         if ( $wp_current_db_version < 34030 ) {
                 $wpdb->query( "ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)" );
         }
+
+        if ( $wp_current_db_version < 34529 ) {
+                drop_index( $wpdb->comments, 'comment_post_ID' );
+        }
 }
 
 /**

src/wp-includes/version.php

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