Ticket #19755: 19755.2.patch

src/wp-admin/includes/schema.php

@@ -258 +258 @@
   KEY domain (domain(50),path(5)),
   KEY lang_id (lang_id)
 ) $charset_collate;
-CREATE TABLE $wpdb->blog_versions (
-  blog_id bigint(20) NOT NULL default '0',
-  db_version varchar(20) NOT NULL default '',
-  last_updated datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (blog_id),
-  KEY db_version (db_version)
-) $charset_collate;
 CREATE TABLE $wpdb->registration_log (
   ID bigint(20) NOT NULL auto_increment,
   email varchar(255) NOT NULL default '',

src/wp-admin/includes/upgrade.php

@@ -430 +430 @@
         wp_cache_flush();
 
         if ( is_multisite() ) {
-                if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
+                        // blog_versions may not exist.
+                        if (  $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->blog_versions}'" ) ) {         
+if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
                         $wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
                 else
                         $wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+                }
         }
 
         /**
@@ -1844 +1847 @@
                                 unset( $tables['sitecategories'] );
                         }
 
+                        // blog_versions may not exist.
+                        if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['blog_versions']}'" ) ) {
+                                unset( $tables['blog_versions'] );
+                        }
+
                         foreach ( $tables as $table ) {
                                 maybe_convert_table_to_utf8mb4( $table );
                         }
@@ -1873 +1881 @@
                                 unset( $tables['sitecategories'] );
                         }
 
+                        // blog_versions may not exist.
+                        if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['blog_versions']}'" ) ) {
+                                unset( $tables['blog_versions'] );
+                        }
+
                         foreach ( $tables as $table ) {
                                 maybe_convert_table_to_utf8mb4( $table );
                         }