1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mysql_upgrade.test:

Browse Source 
Fix minor merge "oopsie"


mysql-test/t/mysql_upgrade.test:
  Fix minor merge "oopsie"
This commit is contained in:
unknown 2007-04-23 21:27:43 +02:00
parent dc5dd7a264
commit 68d4ee627e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/t/mysql_upgrade.test
View File

@ -7,10 +7,6 @@
select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade; select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade;
--enable_query_log --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 # Basic test that we can run mysql_upgrde and that it finds the
# expected binaries it uses. # expected binaries it uses.
@ -22,7 +18,7 @@ let $VERSION=`select LEFT(version(), 6)`;
file_exists $MYSQLTEST_VARDIR/master-data/mysql_upgrade_info; file_exists $MYSQLTEST_VARDIR/master-data/mysql_upgrade_info;
--echo Run it again - should say already completed --echo Run it again - should say already completed
--replace_result $VERSION VERSION --replace_result $MYSQL_SERVER_VERSION VERSION
--error 1 --error 1
--exec $MYSQL_UPGRADE --skip-verbose 2>&1 --exec $MYSQL_UPGRADE --skip-verbose 2>&1