#164532 follow up by pwolanin, David Strauss, catch and myself, testing also by hswong3i: some indexes added before Drupal 6 RC1 were too unique, and our code did not back them, so we should not add those indexes

1 files changed, 3 insertions, 5 deletions

diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index 18ee82e1f..fa17ede78 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -43,10 +43,10 @@ function taxonomy_schema() {
       ),
     ),
     'primary key' => array('tid'),
-    'unique keys' => array(
+    'indexes' => array(
+      'taxonomy_tree' => array('vid', 'weight', 'name'),
       'vid_name' => array('vid', 'name'),
     ),
-    'indexes' => array('taxonomy_tree' => array('vid', 'weight', 'name')),
   );
 
   $schema['term_hierarchy'] = array(
@@ -160,11 +160,9 @@ function taxonomy_schema() {
         'description' => t('The name of the synonym.'),
       ),
     ),
-    'unique keys' => array(
-      'name_tid' => array('name', 'tid'),
-    ),
     'indexes' => array(
       'tid' => array('tid'),
+      'name_tid' => array('name', 'tid'),
     ),
     'primary key' => array('tsid'),
   );