Index: wp-admin/includes/schema.php
===================================================================
--- wp-admin/includes/schema.php	(revision 12320)
+++ wp-admin/includes/schema.php	(working copy)
@@ -110,7 +110,7 @@
   autoload varchar(20) NOT NULL default 'yes',
   PRIMARY KEY  (option_id),
   UNIQUE option_name (option_name),
-  UNIQUE autoloaded_options (autoload, option_name)
+  UNIQUE autoloaded_options (autoload)
 ) $charset_collate;
 CREATE TABLE $wpdb->postmeta (
   meta_id bigint(20) unsigned NOT NULL auto_increment,