WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Term Meta: Prevent a "Multiple primary key defined" error during database upgrades. 

You must have two spaces between the words `PRIMARY KEY` and the definition of your primary key. Yes, seriously.

See [34529].
Fixes #34210.
Built from https://develop.svn.wordpress.org/trunk@34936


git-svn-id: http://core.svn.wordpress.org/trunk@34901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-10-08 11:09:26 +00:00
parent 24128dfc90
commit f8c467e07a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
term_id bigint(20) unsigned NOT NULL default '0', term_id bigint(20) unsigned NOT NULL default '0',
meta_key varchar(255) default NULL, meta_key varchar(255) default NULL,
meta_value longtext, meta_value longtext,
PRIMARY KEY (meta_id), PRIMARY KEY (meta_id),
KEY term_id (term_id), KEY term_id (term_id),
KEY meta_key (meta_key($max_index_length)) KEY meta_key (meta_key($max_index_length))
) $charset_collate; ) $charset_collate;

2
wp-includes/version.php
View File

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