From a21f890abb6345f3065b32e82323d41556ecc02f Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Fri, 19 Jun 2015 03:18:26 +0000
Subject: [PATCH] Remove a redundant index drop, it'll be dropped and
 re-created a few lines further down. Fixes a warning during updating from 4.0
 or earlier. Fixes #31388 for trunk

Built from https://develop.svn.wordpress.org/trunk@32852


git-svn-id: http://core.svn.wordpress.org/trunk@32823 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/upgrade.php | 5 -----
 wp-includes/version.php       | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index d5b58206b0..a3e09c86ab 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -2620,11 +2620,6 @@ function pre_schema_upgrade() {
 		}
 	}
 
-	if ( $wp_current_db_version < 30133 ) {
-		// dbDelta() can recreate but can't drop the index.
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug" );
-	}
-
 	// Upgrade versions prior to 4.2.
 	if ( $wp_current_db_version < 31351 ) {
 		if ( ! is_multisite() ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 54e3e06459..deafd4f619 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32851';
+$wp_version = '4.3-alpha-32852';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.