Make option_id primary. Add uniques for option_name and autoload. see #2699

git-svn-id: https://develop.svn.wordpress.org/trunk@12217 602fd350-edb4-49c9-b593-d223f7449a82

wp-admin/includes/schema.php

@@ -108,8 +108,9 @@ CREATE TABLE $wpdb->options (
   option_name varchar(64) NOT NULL default '',
   option_value longtext NOT NULL,
   autoload varchar(20) NOT NULL default 'yes',
-  PRIMARY KEY  (option_name),
-  KEY option_id (option_id)
+  PRIMARY KEY  (option_id),
+  UNIQUE option_name (option_name),
+  UNIQUE autoloaded_options (autoload, option_name)
 ) $charset_collate;
 CREATE TABLE $wpdb->postmeta (
   meta_id bigint(20) unsigned NOT NULL auto_increment,