Index: webform.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.install,v
retrieving revision 1.64
diff -u -r1.64 webform.install
--- webform.install	7 Feb 2011 03:51:08 -0000	1.64
+++ webform.install	17 Feb 2011 19:50:49 -0000
@@ -305,10 +305,13 @@
         'length' => 128,
       ),
     ),
+    'primary key' => array('sid'),
     'unique keys' => array(
       'sid_nid' => array('sid', 'nid'),
     ),
-    'primary key' => array('sid'),
+    'indexes' => array(
+      'sid_nid_uid' => array('sid', 'nid', 'uid'),
+    ),
   );
 
   $schema['webform_submitted_data'] = array(
@@ -350,11 +353,11 @@
         'not null' => TRUE,
       ),
     ),
+    'primary key' => array('nid', 'sid', 'cid', 'no'),
     'indexes' => array(
       'nid' => array('nid'),
       'sid_nid' => array('sid', 'nid'),
     ),
-    'primary key' => array('nid', 'sid', 'cid', 'no'),
   );
 
   return $schema;
@@ -526,3 +529,12 @@
     db_add_field('webform', 'auto_save', array('type' => 'int', 'size' => 'tiny', 'not null' => TRUE, 'default' => 0));
   }
 }
+
+/**
+ * Add an index for sid_nid_uid to {webform_submissions}.
+ */
+function webform_update_7310() {
+  if (!db_index_exists('webform_submissions', 'sid_nid_uid')) {
+    db_add_index('webform_submissions', 'sid_nid_uid', array('sid', 'nid', 'uid'));
+  }
+}