diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2009-10-28 14:02:00 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2009-10-28 14:02:00 +0400 |
| commit | 05ddc34be8f59f93da53f6e8ebc9fa0de71abcac (patch) | |
| tree | 104d642cdfe674f13f48fb605a7127cd1b94f2f2 /mysql-test/t/mysql_upgrade.test | |
| parent | 273a0a4f97ea07620675cba1f61e84dd83c21a2f (diff) | |
| download | mariadb-git-05ddc34be8f59f93da53f6e8ebc9fa0de71abcac.tar.gz | |
WL#4991 mysql_upgrade --fix-privilege-tables
(backport)
mysql_upgrade script accepts --upgrade-system-tables option,
fixing only system tables in this case.
per-file comments:
client/mysql_upgrade.c
WL#4991 mysql_upgrade --fix-privilege-tables
--upgrade-system-tables option added.
if it is set, the tool won't look for the mysqlcheck then
run_mysqlcheck_fixnames() and run_mysqlcheck_upgrade won't be called.
mysql-test/r/mysql_upgrade.result
WL#4991 mysql_upgrade --fix-privilege-tables
test result added
mysql-test/t/mysql_upgrade.test
WL#4991 mysql_upgrade --fix-privilege-tables
test case added
Diffstat (limited to 'mysql-test/t/mysql_upgrade.test')
| -rw-r--r-- | mysql-test/t/mysql_upgrade.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index d1f97d7287e..7bf329744a2 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -89,3 +89,9 @@ DROP USER mysqltest1@'%'; set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; --exec $MYSQL_UPGRADE --skip-verbose --force 2>&1 eval set GLOBAL sql_mode=default; + +# +# Test the --upgrade-system-tables option +# +--exec $MYSQL_UPGRADE --upgrade-system-tables + |