From cea697b2344ef50474d125335cdfe3e6a6d1fdc3 Mon Sep 17 00:00:00 2001
From: mikelittle <mikelittle@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 20 Jul 2003 20:43:48 +0000
Subject: [PATCH] Fixed error with table changes backquotes do't work on older
 versions of mysql

git-svn-id: http://svn.automattic.com/wordpress/trunk@261 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/b2-2-wp.php            | 17 +++++++++--------
 wp-admin/upgrade-070-to-071.php |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/wp-admin/b2-2-wp.php b/wp-admin/b2-2-wp.php
index 7af570ee41..ebc58aaf74 100644
--- a/wp-admin/b2-2-wp.php
+++ b/wp-admin/b2-2-wp.php
@@ -1,4 +1,5 @@
 <?php
+$_wp_installing = 1;
 require_once('../wp-config.php');
 
 $step = $HTTP_GET_VARS['step'];
@@ -200,9 +201,9 @@ if ($got_row) {
 
 $query = "ALTER TABLE $tableposts ADD COLUMN post_excerpt text NOT NULL;";
 $q = $wpdb->query($query);
-$query = "ALTER TABLE $tableposts ADD `post_status` ENUM('publish','draft','private') NOT NULL,
-ADD `comment_status` ENUM('open','closed') NOT NULL,
-ADD `ping_status` ENUM('open','closed') NOT NULL,
+$query = "ALTER TABLE $tableposts ADD post_status ENUM('publish','draft','private') NOT NULL,
+ADD comment_status ENUM('open','closed') NOT NULL,
+ADD ping_status ENUM('open','closed') NOT NULL,
 ADD post_password varchar(20) NOT NULL;";
 $q = $wpdb->query($query);
 ?>
@@ -210,7 +211,7 @@ $q = $wpdb->query($query);
 <p>That went well! Now let's clean up the b2 database structure a bit...</p>
 
 <?php
-$query = "ALTER TABLE $tableposts DROP INDEX `ID`";
+$query = "ALTER TABLE $tableposts DROP INDEX ID";
 
 $q = $wpdb->query($query);
 ?>
@@ -219,7 +220,7 @@ $q = $wpdb->query($query);
 
 <?php
 
-$query="ALTER TABLE $tablesettings DROP INDEX `ID`";
+$query="ALTER TABLE $tablesettings DROP INDEX ID";
 $q = $wpdb->query($query);
 
 ?>
@@ -227,7 +228,7 @@ $q = $wpdb->query($query);
 <p>So far so good.</p>
 <?php
 
-$query="ALTER TABLE $tableposts DROP `post_karma`";
+$query="ALTER TABLE $tableposts DROP post_karma";
 $q = $wpdb->query($query);
 
 ?>
@@ -236,7 +237,7 @@ $q = $wpdb->query($query);
 
 <?php
 
-$query = "ALTER TABLE $tableusers DROP INDEX `ID`";
+$query = "ALTER TABLE $tableusers DROP INDEX ID";
 
 $q = $wpdb->query($query);
 
@@ -252,4 +253,4 @@ $q = $wpdb->query($query);
 ?>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/wp-admin/upgrade-070-to-071.php b/wp-admin/upgrade-070-to-071.php
index 9c84b02098..650f760b8b 100644
--- a/wp-admin/upgrade-070-to-071.php
+++ b/wp-admin/upgrade-070-to-071.php
@@ -1,4 +1,5 @@
 <?php
+$_wp_installing = 1;
 require_once('../wp-config.php');
 
 $step = $HTTP_GET_VARS['step'];
@@ -81,4 +82,4 @@ $q = $wpdb->query($query);
 ?>
 
 </body>
-</html>
\ No newline at end of file
+</html>