Ticket #22134: 22134.diff

src/wp-admin/includes/upgrade.php

@@ -1549 +1549 @@
         $global_tables = $wpdb->tables( 'global' );
         foreach ( $cqueries as $table => $qry ) {
                 // Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined.
-                if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) )
+                if ( in_array( $table, $global_tables ) && ( ! is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) ) {
+                        $suppress = $wpdb->suppress_errors();
+                        $tablefields = $wpdb->get_results( "DESCRIBE {$table};" );
+                        $wpdb->suppress_errors( $suppress );
+                        if ( $tablefields )
+                                unset( $cqueries[ $table ], $for_update[ $table ] );
                         continue;
+                }
 
                 // Fetch the table column structure from the database
                 $suppress = $wpdb->suppress_errors();