From 555a9f091267cdf9e2bb9a59e581b78c11d49a44 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Fri, 6 Feb 2015 05:26:21 +0000
Subject: [PATCH] Upgrades: When deciding if we can upgrade a table to utf8mb4,
 make sure we're checking the character set, not the collation.

Bump the DB version as well, as the update in [31349] wouldn't have triggered for anyone who tried it.

See #21212


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


git-svn-id: http://core.svn.wordpress.org/trunk@31332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/upgrade.php | 14 ++++++++------
 wp-includes/version.php       |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 5df932cebf..1b88eb3690 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -519,7 +519,7 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 29630 )
 		upgrade_400();
 
-	if ( $wp_current_db_version < 31349 )
+	if ( $wp_current_db_version < 31351 )
 		upgrade_420();
 
 	maybe_disable_link_manager();
@@ -1417,7 +1417,7 @@ function upgrade_400() {
 function upgrade_420() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 31349 && $wpdb->charset === 'utf8mb4' ) {
+	if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
 		if ( is_multisite() ) {
 			$tables = $wpdb->tables( 'blog' );
 		} else {
@@ -1528,7 +1528,7 @@ function upgrade_network() {
 	}
 
 	// 4.2
-	if ( $wp_current_db_version < 31349 && $wpdb->charset === 'utf8mb4' ) {
+	if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
 		if ( ! ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && DO_NOT_UPGRADE_GLOBAL_TABLES ) ) {
 			$wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
 			$wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
@@ -1665,9 +1665,11 @@ function maybe_convert_table_to_utf8mb4( $table ) {
 	$has_utf8 = false;
 	foreach ( $results as $column ) {
 		if ( $column->Collation ) {
-			if ( 'utf8' === $column->Collation ) {
+			list( $charset ) = explode( '_', $column->Collation );
+			$charset = strtolower( $charset );
+			if ( 'utf8' === $charset ) {
 				$has_utf8 = true;
-			} elseif ( 'utf8mb4' !== $column->Collation ) {
+			} elseif ( 'utf8mb4' !== $charset ) {
 				// Don't upgrade tables that have non-utf8 columns.
 				return false;
 			}
@@ -2361,7 +2363,7 @@ function pre_schema_upgrade() {
 	}
 
 	// Upgrade versions prior to 4.2.
-	if ( $wp_current_db_version < 31349 ) {
+	if ( $wp_current_db_version < 31351 ) {
 		// So that we can change tables to utf8mb4, we need to shorten the index lengths to less than 767 bytes
 		$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
 		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))" );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cb77fe8b09..c6a2fea7b3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,14 +4,14 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31350';
+$wp_version = '4.2-alpha-31351';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 31349;
+$wp_db_version = 31351;
 
 /**
  * Holds the TinyMCE version