From 05ddc34be8f59f93da53f6e8ebc9fa0de71abcac Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Wed, 28 Oct 2009 14:02:00 +0400 Subject: 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 --- mysql-test/t/mysql_upgrade.test | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mysql-test/t/mysql_upgrade.test') 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 + -- cgit v1.2.1