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

Upgrades: If a table has already been converted to utf8mb4, there's no need to try and convert it again.

Browse Source 
Props gabrielperezs for the initial patch.

See #32310.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-05-08 12:22:25 +00:00
parent 837fd1ca10
commit 02621f2a14
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1751,6 +1751,17 @@ function maybe_convert_table_to_utf8mb4( $table ) {
}
}
$table_details = $wpdb->get_row( "SHOW TABLE STATUS LIKE '$table'" );
if ( ! $table_details ) {
return false;
}
list( $table_charset ) = explode( '_', $table_details->Collation );
$table_charset = strtolower( $table_charset );
if ( 'utf8mb4' === $table_charset ) {
return true;
}
return $wpdb->query( "ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" );
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-32455';
$wp_version = '4.3-alpha-32456';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.