Ticket #31869: 31869.3.diff

src/wp-admin/includes/upgrade.php

@@ -1980 +1980 @@
                                                 $index_columns .= '('.$column_data['subpart'].')';
                                         }
                                 }
+
+                                // The alternative index string doesn't care about subparts
+                                $alt_index_columns = preg_replace( '/\([^)]*\)/', '', $index_columns );
+                                $alt_index_string  = $index_string;
+
                                 // Add the column list to the index create string.
-                                $index_string .= ' ('.$index_columns.')';
+                                $index_string     .= ' (' . $index_columns . ')';
+                                $alt_index_string .= ' (' . $alt_index_columns . ')';
+
                                 if (!(($aindex = array_search($index_string, $indices)) === false)) {
                                         unset($indices[$aindex]);
                                         // todo: Remove this?
                                         //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
                                 }
+                                if ( ! ( ( $aindex = array_search( $alt_index_string, $indices ) ) === false ) ) {
+                                        _doing_it_wrong( __FUNCTION__, sprintf( __( 'You should be specifying an index length in the CREATE TABLE statement for the %s index.' ), "$table.$index_name" ), '4.2' );
+                                        unset( $indices[ $aindex ] );
+                                }
                                 // todo: Remove this?
                                 //else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
                         }