From 22784619f4bc590b7c8bbfd2d284185e5fe6b5f3 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Tue, 31 Jan 2012 17:45:22 +0000
Subject: [PATCH] Drop the blog_id column from the options table during
 upgrade. Props barry. fixes #17188

git-svn-id: https://develop.svn.wordpress.org/trunk@19798 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/upgrade.php | 16 ++++++++++++++++
 wp-includes/version.php       |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 50c5da29fd..a1ceeed96c 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -459,6 +459,9 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 19389 )
 		upgrade_330();
 
+	if ( $wp_current_db_version < 19793 )
+		upgrade_340();
+
 	maybe_disable_automattic_widgets();
 
 	update_option( 'db_version', $wp_db_version );
@@ -1213,6 +1216,19 @@ function upgrade_330() {
 	}
 }
 
+/**
+ * Execute changes made in WordPress 3.4.
+ *
+ * @since 3.4.0
+ */
+function upgrade_340() {
+	global $wp_current_db_version, $wpdb;
+
+	$wpdb->hide_errors();
+	$wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
+	$wpdb->show_errors();
+}	
+	
 /**
  * Execute network level changes
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ffe69fab60..b8d50d2e44 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -11,7 +11,7 @@ $wp_version = '3.4-alpha-19719';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 19793;
+$wp_db_version = 19798;
 
 /**
  * Holds the TinyMCE version