bk commit into 5.0 tree (tsmith:1.2452)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-23 21:27:43+02:00, tsmith@stripped +1 -0
  mysql_upgrade.test:
    Fix minor merge "oopsie"

  mysql-test/t/mysql_upgrade.test@stripped, 2007-04-23 21:27:33+02:00, tsmith@stripped +1 -5
    Fix minor merge "oopsie"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

--- 1.6/mysql-test/t/mysql_upgrade.test	2007-04-19 21:35:09 +02:00
+++ 1.7/mysql-test/t/mysql_upgrade.test	2007-04-23 21:27:33 +02:00
@@ -7,10 +7,6 @@
 select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade;
 --enable_query_log
 
-# Get version of the server so it can be masked out in the
-# error messages from mysql_upgrade
-let $VERSION=`select LEFT(version(), 6)`;
-
 #
 # Basic test that we can run mysql_upgrde and that it finds the
 # expected binaries it uses.
@@ -22,7 +18,7 @@ let $VERSION=`select LEFT(version(), 6)`
 file_exists $MYSQLTEST_VARDIR/master-data/mysql_upgrade_info;
 
 --echo Run it again - should say already completed
---replace_result $VERSION VERSION
+--replace_result $MYSQL_SERVER_VERSION VERSION
 --error 1
 --exec $MYSQL_UPGRADE --skip-verbose 2>&1