Changeset 32380

Timestamp:

05/06/2015 07:41:55 AM (10 years ago)

Author:

pento

Message:

Upgrades: When converting to utf8mb4, we were trying to change the wrong index on wp_signups, causing the conversion to later fail.

Merge [32378] to the 4.2 branch.

Props kovshenin, pento.

Fixes #32099.

Location:

branches/4.2/src

Files:

• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

branches/4.2/src/wp-admin/includes/upgrade.php

@@ -1593 +1593 @@
             $wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
             $wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-            $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
+            $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
 
             $tables = $wpdb->tables( 'global' );
@@ -1599 +1599 @@
             foreach ( $tables as $table ) {
                 maybe_convert_table_to_utf8mb4( $table );
+            }
+        }
+    }
+
+    // 4.2.2
+    if ( $wp_current_db_version < 31535 && 'utf8mb4' === $wpdb->charset ) {
+        if ( ! ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && DO_NOT_UPGRADE_GLOBAL_TABLES ) ) {
+            $upgrade = false;
+            $indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
+            foreach( $indexes as $index ) {
+                if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) {
+                    $upgrade = true;
+                    break;
+                }
+            }
+
+            if ( $upgrade ) {
+                $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
             }
         }

branches/4.2/src/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 31534;
+$wp_db_version = 31535;
 
 /**