From d3e30f2ff6d359069e8cf1cbce46eb596b126315 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 7 Dec 2009 13:57:18 +0000 Subject: [PATCH] Drop autoload index from schema. Tweak key layout to satisdy dbDelta. Props nacin. fixes #11322 #2699 git-svn-id: http://svn.automattic.com/wordpress/trunk@12329 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 3 +-- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 18cf8068e7..cc2f08be62 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -109,8 +109,7 @@ CREATE TABLE $wpdb->options ( option_value longtext NOT NULL, autoload varchar(20) NOT NULL default 'yes', PRIMARY KEY (option_id), - UNIQUE option_name (option_name), - UNIQUE autoloaded_options (autoload, option_name) + UNIQUE KEY option_name (option_name) ) $charset_collate; CREATE TABLE $wpdb->postmeta ( meta_id bigint(20) unsigned NOT NULL auto_increment, diff --git a/wp-includes/version.php b/wp-includes/version.php index b61d45167a..ab38a65a75 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -15,7 +15,7 @@ $wp_version = '2.9-beta-2'; * * @global int $wp_db_version */ -$wp_db_version = 12217; +$wp_db_version = 12329; /** * Holds the TinyMCE version