- Patch #192348 by douggreen and bjaspan: fixed database inconsistencies.

modules/search/search.install

@@ -55,7 +55,7 @@ function search_schema() {
         'description' => t('Set to force node reindexing.'),
       ),
     ),
-    'indexes' => array('sid_type' => array('sid', 'type')),
+    'unique keys' => array('sid_type' => array('sid', 'type')),
   );
 
   $schema['search_index'] = array(

modules/system/system.install

@@ -4515,7 +4515,7 @@ function system_update_6036() {
       // Since it's possible that some existing sites have duplicates,
       // create the index using the IGNORE keyword, which ignores duplicate errors.
       // However, pgsql doesn't support it
-      $ret[] = update_sql("ALTER IGNORE TABLE {search_index} ADD UNIQUE KEY sid_word_type (sid, word, type)");
+      $ret[] = update_sql("ALTER IGNORE TABLE {search_index} ADD UNIQUE KEY word_sid_type (word, sid, type)");
       $ret[] = update_sql("ALTER IGNORE TABLE {search_dataset} ADD UNIQUE KEY sid_type (sid, type)");
     }
     else {