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