? modules/node/node.content_forms.inc
Index: modules/system/system.schema
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.schema,v
retrieving revision 1.8
diff -u -p -r1.8 system.schema
--- modules/system/system.schema	15 Jul 2007 10:09:21 -0000	1.8
+++ modules/system/system.schema	5 Aug 2007 20:55:30 -0000
@@ -169,7 +169,10 @@ function system_schema() {
       'info'           => array('type' => 'text', 'not null' => FALSE)
     ),
     'primary key' => array('filename'),
-    'indexes' => array('weight' => array('weight')),
+    'indexes' => array(
+      'type_status' => array(array('type', 8), 'status', 'weight', 'filename'),
+      'name_type'   => array(array('name', 16), array('type', 8)),
+    ),
   );
 
   $schema['url_alias'] = array(
Index: modules/taxonomy/taxonomy.schema
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.schema,v
retrieving revision 1.1
diff -u -p -r1.1 taxonomy.schema
--- modules/taxonomy/taxonomy.schema	25 May 2007 12:46:46 -0000	1.1
+++ modules/taxonomy/taxonomy.schema	5 Aug 2007 20:55:30 -0000
@@ -11,6 +11,7 @@ function taxonomy_schema() {
       'weight'      => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')
     ),
     'primary key' => array('tid'),
+    'unique keys' => array('vid_name' => array('vid', 'name')),
     'indexes' => array('vid' => array('vid')),
   );
 
@@ -35,7 +36,6 @@ function taxonomy_schema() {
     'indexes' => array(
       'nid' => array('nid'),
       'tid' => array('tid'),
-      'vid' => array('vid')
     ),
     'primary key' => array(
       'vid',