From 36d2989fed437bab3ec7d64b67340121a9ff438f Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 30 Jan 2012 20:47:25 +0000
Subject: [PATCH] Remove blog_id column from wp_options. Props scribu. fixes
 #17188

git-svn-id: http://svn.automattic.com/wordpress/trunk@19793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/schema.php | 1 -
 wp-includes/version.php      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index cfc8d9188..0885d6dca 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -128,7 +128,6 @@ CREATE TABLE $wpdb->links (
 ) $charset_collate;
 CREATE TABLE $wpdb->options (
   option_id bigint(20) unsigned NOT NULL auto_increment,
-  blog_id int(11) NOT NULL default '0',
   option_name varchar(64) NOT NULL default '',
   option_value longtext NOT NULL,
   autoload varchar(20) NOT NULL default 'yes',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a21710fdc..ffe69fab6 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 = 19784;
+$wp_db_version = 19793;
 
 /**
  * Holds the TinyMCE version