Changeset 19799

Timestamp:

01/31/2012 06:26:07 PM (14 years ago)

Author:

ryan

Message:

Drop the comment_approved index from the comments table. comment_approved_date_gmt is sufficient. fixes #19935

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -104 +104 @@
   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),

trunk/wp-admin/includes/upgrade.php

@@ -460 +460 @@
         upgrade_330();
 
-    if ( $wp_current_db_version < 19793 )
+    if ( $wp_current_db_version < 19799 )
         upgrade_340();
 
@@ -1225 +1225 @@
     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();
+    }
+
+    if ( $wp_current_db_version < 19799 ) {
+        $wpdb->hide_errors();
+        $wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved");
+        $wpdb->show_errors();
+    }
+}
+
 /**
  * Execute network level changes

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 19798;
+$wp_db_version = 19799;
 
 /**