diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 00:19:17 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 00:19:17 +0100 |
| commit | df7b27f1fe308fd4011fa020bebd7c69bcd43383 (patch) | |
| tree | 3b4200849bf9bf6a1f47e4cdf1e5ebb32094c844 /mysql-test/r/mysql_upgrade_ssl.result | |
| parent | 51d7e80355ec76f9f696835fccb63249918534a8 (diff) | |
| download | mariadb-git-df7b27f1fe308fd4011fa020bebd7c69bcd43383.tar.gz | |
MDEV-6984 Can't migrate from MySQL 5.6.21 to MariaDB 10
in mysql_upgrade: do FLUSH PRIVILEGES at the end, not together with
mysql_fix_privilege_tables
mysql-test/t/mysql_upgrade-6984.opt:
use a dummy second option to force server restart after the test
Diffstat (limited to 'mysql-test/r/mysql_upgrade_ssl.result')
| -rw-r--r-- | mysql-test/r/mysql_upgrade_ssl.result | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/r/mysql_upgrade_ssl.result index 14671aa6409..1bbee22aba2 100644 --- a/mysql-test/r/mysql_upgrade_ssl.result +++ b/mysql-test/r/mysql_upgrade_ssl.result @@ -1,7 +1,7 @@ # # Bug#55672 mysql_upgrade dies with internal error # -Phase 1/4: Checking mysql database +Phase 1/5: Checking mysql database Processing databases mysql mysql.column_stats OK @@ -32,9 +32,9 @@ mysql.time_zone_name OK mysql.time_zone_transition OK mysql.time_zone_transition_type OK mysql.user OK -Phase 2/4: Running 'mysql_fix_privilege_tables'... -Phase 3/4: Fixing table and database names -Phase 4/4: Checking and upgrading tables +Phase 2/5: Running 'mysql_fix_privilege_tables'... +Phase 3/5: Fixing table and database names +Phase 4/5: Checking and upgrading tables Processing databases information_schema mtr @@ -42,4 +42,5 @@ mtr.global_suppressions OK mtr.test_suppressions OK performance_schema test +Phase 5/5: Running 'FLUSH PRIVILEGES'... OK |