From eff49de23e87dabb17b07b74f04b104748df8517 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Thu, 29 Oct 2009 10:03:16 +0400 Subject: [PATCH] mysql_upgrade test fixed per-file comments: mysql-test/r/mysql_upgrade.result result updated mysql-test/t/mysql_upgrade.test --skip-verbose option added to the call --- mysql-test/r/mysql_upgrade.result | 3 --- mysql-test/t/mysql_upgrade.test | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 3ff4c1eba64..b96b579d9b5 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -127,7 +127,4 @@ mysql.time_zone_transition OK mysql.time_zone_transition_type OK mysql.user OK set GLOBAL sql_mode=default; -Looking for 'mysql' as: /home/hf/work/mysql_common/wl4991/client/mysql The --upgrade-system-tables option was used, databases won't be touched. -Running 'mysql_fix_privilege_tables'... -OK diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 7bf329744a2..8bcbe064b68 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -93,5 +93,6 @@ eval set GLOBAL sql_mode=default; # # Test the --upgrade-system-tables option # ---exec $MYSQL_UPGRADE --upgrade-system-tables +--replace_result $MYSQLTEST_VARDIR var +--exec $MYSQL_UPGRADE --skip-verbose --upgrade-system-tables