Index: modules/search/search.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.install,v
retrieving revision 1.16
diff -u -p -r1.16 search.install
--- modules/search/search.install	2 Nov 2008 14:56:15 -0000	1.16
+++ modules/search/search.install	30 Oct 2008 19:12:28 -0000
@@ -55,9 +55,7 @@ function search_schema() {
         'description' => t('Set to force node reindexing.'),
       ),
     ),
-    'indexes' => array(
-      'sid_type' => array('sid', 'type'),
-    ),
+    'primary key' => array('sid', 'type'),
   );
 
   $schema['search_index'] = array(
@@ -93,9 +91,7 @@ function search_schema() {
       'sid_type' => array('sid', 'type'),
       'word' => array('word'),
     ),
-    'unique keys' => array(
-      'word_sid_type' => array('word', 'sid', 'type'),
-    ),
+    'primary key' => array('word', 'sid', 'type'),
   );
 
   $schema['search_total'] = array(
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.274
diff -u -p -r1.274 system.install
--- modules/system/system.install	2 Nov 2008 14:56:15 -0000	1.274
+++ modules/system/system.install	30 Oct 2008 19:17:05 -0000
@@ -3101,12 +3101,16 @@ function system_update_7011() {
 }
 
 /**
- * Replace unique key 'sid_type' by indexes in 'search_dataset' table.
+ * Replace unique keys in 'search_dataset' and 'search_index' by primary keys.
  */
 function system_update_7012() {
   $ret = array();
   db_drop_unique_key($ret, 'search_dataset', 'sid_type');
-  db_add_index($ret, 'search_dataset', 'sid_type', array('sid', 'type'));
+  db_add_primary_key($ret, 'search_dataset', array('sid', 'type'));
+  
+  db_drop_index($ret, 'search_index', 'word');
+  db_drop_unique_key($ret, 'search_index', 'word_sid_type');
+  db_add_primary_key($ret, 'search_index', array('word', 'sid', 'type'));
   return $ret;
 }