Ticket #19755: 19755.patch

wp-admin/includes/schema.php

@@ -246 +246 @@
   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 '',

wp-admin/includes/upgrade.php

@@ -373 +373 @@
         if ( is_multisite() && is_main_site() )
                 upgrade_network();
         wp_cache_flush();
-
-        if ( is_multisite() ) {
-                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());" );
-        }
 }
 endif;
 
@@ -459 +452 @@
         if ( $wp_current_db_version < 19389 )
                 upgrade_330();
 
+        if ( $wp_current_db_version < 19471 )
+                upgrade_340();
+
         maybe_disable_automattic_widgets();
 
         update_option( 'db_version', $wp_db_version );
@@ -1214 +1210 @@
 }
 
 /**
+ * Execute changes made in WordPress 3.4.
+ *
+ * @since 3.4.0
+ */
+function upgrade_340() {
+        global $wpdb;
+        $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'blog_versions');
+}
+
+/**
  * Execute network level changes
  *
  * @since 3.0.0

wp-includes/version.php

@@ -11 +11 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 19470;
+$wp_db_version = 19471;
 
 /**
  * Holds the TinyMCE version

wp-includes/wp-db.php

@@ -230 +230 @@
          * @var array
          */
         var $ms_global_tables = array( 'blogs', 'signups', 'site', 'sitemeta',
-                'sitecategories', 'registration_log', 'blog_versions' );
+                'sitecategories', 'registration_log' );
 
         /**
          * WordPress Comments table
@@ -345 +345 @@
         var $blogs;
 
         /**
-         * Multisite Blog Versions table
-         *
-         * @since 3.0.0
-         * @access public
-         * @var string
-         */
-        var $blog_versions;
-
-        /**
          * Multisite Registration Log table
          *
          * @since 3.0.0