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 | 36299d59efdf9494aca1bcf078f81cc979a962ae (patch) | |
| tree | 104d642cdfe674f13f48fb605a7127cd1b94f2f2 /mysql-test/r/mysql_upgrade.result | |
| parent | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff) | |
| download | mariadb-git-36299d59efdf9494aca1bcf078f81cc979a962ae.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/r/mysql_upgrade.result')
| -rw-r--r-- | mysql-test/r/mysql_upgrade.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 384442f8c31..3ff4c1eba64 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -127,3 +127,7 @@ 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 |