diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-04 17:17:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-10 18:21:25 +0100 |
| commit | 3d06f0f72cbabe833036f920e9452cd6ef46e5aa (patch) | |
| tree | f3f974bd1f77a1b52a3a3aed124da49f01e6e27c /mysql-test/r/mysql_upgrade_ssl.result | |
| parent | c372388e4862938037f98b6e4936bc61872354dd (diff) | |
| download | mariadb-git-3d06f0f72cbabe833036f920e9452cd6ef46e5aa.tar.gz | |
MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation
fix the patch. add tests
Diffstat (limited to 'mysql-test/r/mysql_upgrade_ssl.result')
| -rw-r--r-- | mysql-test/r/mysql_upgrade_ssl.result | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/r/mysql_upgrade_ssl.result index e06d1bb1671..918a24ffc71 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/6: Checking and upgrading mysql database +Phase 1/7: Checking and upgrading mysql database Processing databases mysql mysql.column_stats OK @@ -32,10 +32,11 @@ mysql.time_zone_name OK mysql.time_zone_transition OK mysql.time_zone_transition_type OK mysql.user OK -Phase 2/6: Fixing views -Phase 3/6: Running 'mysql_fix_privilege_tables' -Phase 4/6: Fixing table and database names -Phase 5/6: Checking and upgrading tables +Phase 2/7: Installing used storage engines... Skipped +Phase 3/7: Fixing views +Phase 4/7: Running 'mysql_fix_privilege_tables' +Phase 5/7: Fixing table and database names +Phase 6/7: Checking and upgrading tables Processing databases information_schema mtr @@ -43,5 +44,5 @@ mtr.global_suppressions OK mtr.test_suppressions OK performance_schema test -Phase 6/6: Running 'FLUSH PRIVILEGES' +Phase 7/7: Running 'FLUSH PRIVILEGES' OK |