Index: modules/search/search.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.install,v
retrieving revision 1.17
diff -u -p -r1.17 search.install
--- modules/search/search.install	2 Nov 2008 17:56:20 -0000	1.17
+++ modules/search/search.install	31 Oct 2008 04:24:18 -0000
@@ -89,7 +89,6 @@ function search_schema() {
     ),
     'indexes' => array(
       'sid_type' => array('sid', 'type'),
-      'word' => array('word'),
     ),
     'primary key' => array('word', 'sid', 'type'),
   );
@@ -152,3 +151,27 @@ function search_schema() {
 
   return $schema;
 }
+
+/**
+ * @defgroup search-updates-6.x-to-7.x Search updates from 6.x to 7.x
+ * @{
+ */
+
+/**
+ * Replace unique keys in 'search_dataset' and 'search_index' by primary keys.
+ */
+function search_update_7000() {
+  $ret = array();
+  db_drop_unique_key($ret, 'search_dataset', '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;
+}
+
+/**
+ * @} End of "defgroup search-updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.275
diff -u -p -r1.275 system.install
--- modules/system/system.install	2 Nov 2008 17:56:20 -0000	1.275
+++ modules/system/system.install	31 Oct 2008 04:22:28 -0000
@@ -3101,20 +3101,6 @@ function system_update_7011() {
 }
 
 /**
- * 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_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;
-}
-
-/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */