diff options
| author | tsmith@quadxeon.mysql.com <> | 2007-04-23 21:27:43 +0200 |
|---|---|---|
| committer | tsmith@quadxeon.mysql.com <> | 2007-04-23 21:27:43 +0200 |
| commit | 53985105f9818789ca7382bfbbc99391e3ffb278 (patch) | |
| tree | 5054738387e96fbfe1e68afb64887120f90735df /mysql-test/t/mysql_upgrade.test | |
| parent | 193e154ed41f2c8693184916c107ee1dfe4db64b (diff) | |
| download | mariadb-git-53985105f9818789ca7382bfbbc99391e3ffb278.tar.gz | |
mysql_upgrade.test:
Fix minor merge "oopsie"
Diffstat (limited to 'mysql-test/t/mysql_upgrade.test')
| -rw-r--r-- | mysql-test/t/mysql_upgrade.test | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 51db2e99efd..3f9626fcc42 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -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 |