Ticket #15004: 15004.7.diff

wp-admin/includes/upgrade.php

@@ -1287 +1287 @@
                         update_site_option( 'illegal_names', $illegal_names );
                 }
         }
+
+        // 3.7
+        if ( $wp_current_db_version < 37000 && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && is_main_network() ) {
+                maybe_add_column(
+                        $wpdb->signups,
+                        'signup_id',
+                        "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST"
+                );
+
+                $wpdb->query( "ALTER TABLE $wpdb->signups ADD INDEX user_email (user_email)" );
+                $wpdb->query( "ALTER TABLE $wpdb->signups ADD INDEX user_login_email (user_login,user_email)" );
+                $wpdb->query( "ALTER TABLE $wpdb->signups ADD INDEX domain_path (domain,path)" );
+                $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+        }
 }
 
 // The functions we use to actually do stuff

wp-admin/includes/schema.php

@@ -272 +272 @@
   KEY site_id (site_id)
 ) $charset_collate;
 CREATE TABLE $wpdb->signups (
+  signup_id bigint(20) NOT NULL auto_increment,
   domain varchar(200) NOT NULL default '',
   path varchar(100) NOT NULL default '',
   title longtext NOT NULL,
@@ -282 +283 @@
   active tinyint(1) NOT NULL default '0',
   activation_key varchar(50) NOT NULL default '',
   meta longtext,
+  PRIMARY KEY  (signup_id),
   KEY activation_key (activation_key),
-  KEY domain (domain)
+  KEY user_email (user_email)
+  KEY user_login_email (user_login,user_email),
+  KEY domain_path (domain,path),
 ) $charset_collate;";
 
         switch ( $scope ) {