Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-29 00:04:58 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19799 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-01-31 18:26:07 +00:00
parent 0f80145c67
commit 5fd633b48b
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/includes/schema.php
View File

@ -103,7 +103,6 @@ CREATE TABLE $wpdb->comments (
comment_parent bigint(20) unsigned NOT NULL default '0', comment_parent bigint(20) unsigned NOT NULL default '0',
user_id bigint(20) unsigned NOT NULL default '0', user_id bigint(20) unsigned NOT NULL default '0',
PRIMARY KEY (comment_ID), PRIMARY KEY (comment_ID),
KEY comment_approved (comment_approved),
KEY comment_post_ID (comment_post_ID), KEY comment_post_ID (comment_post_ID),
KEY comment_approved_date_gmt (comment_approved,comment_date_gmt), KEY comment_approved_date_gmt (comment_approved,comment_date_gmt),
KEY comment_date_gmt (comment_date_gmt), KEY comment_date_gmt (comment_date_gmt),

20
wp-admin/includes/upgrade.php
View File

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

2
wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '3.4-alpha-19719';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 19798; $wp_db_version = 19799;
/** /**
* Holds the TinyMCE version * Holds the TinyMCE version