diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2009-10-29 10:03:16 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2009-10-29 10:03:16 +0400 |
| commit | 96f31b3637589587bbc343a76dbc686441ac4b16 (patch) | |
| tree | ead4945e46d29cc12bd29e612b76f8ac0b9d78c3 | |
| parent | 05ddc34be8f59f93da53f6e8ebc9fa0de71abcac (diff) | |
| download | mariadb-git-96f31b3637589587bbc343a76dbc686441ac4b16.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/mysql_upgrade.result | 3 | ||||
| -rw-r--r-- | 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 |