summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql_upgrade_ssl.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-08-06 13:27:44 +0200
committerSergei Golubchik <sergii@pisem.net>2014-08-06 13:27:44 +0200
commit15a9103c480f272be794933fcd26f7f97da9d56b (patch)
tree5d2f4797ac760a55895624dab89951c4957e3a0b /mysql-test/r/mysql_upgrade_ssl.result
parent3390291b95c51db46ba007129fb4878bc03e1e36 (diff)
downloadmariadb-git-15a9103c480f272be794933fcd26f7f97da9d56b.tar.gz
MDEV-6535 Ordering of mysql_upgrade tasks is not optimal
first update system tables, then the rest
Diffstat (limited to 'mysql-test/r/mysql_upgrade_ssl.result')
-rw-r--r--mysql-test/r/mysql_upgrade_ssl.result15
1 files changed, 8 insertions, 7 deletions
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/r/mysql_upgrade_ssl.result
index 87b7d51e8b7..70801da20ea 100644
--- a/mysql-test/r/mysql_upgrade_ssl.result
+++ b/mysql-test/r/mysql_upgrade_ssl.result
@@ -1,13 +1,8 @@
#
# Bug#55672 mysql_upgrade dies with internal error
#
-Phase 1/3: Fixing table and database names
-Phase 2/3: Checking and upgrading tables
+Phase 1/3: Running 'mysql_fix_privilege_tables'...
Processing databases
-information_schema
-mtr
-mtr.global_suppressions OK
-mtr.test_suppressions OK
mysql
mysql.column_stats OK
mysql.columns_priv OK
@@ -37,7 +32,13 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK
mysql.time_zone_transition_type OK
mysql.user OK
+Phase 2/3: Fixing table and database names
+Phase 3/3: Checking and upgrading tables
+Processing databases
+information_schema
+mtr
+mtr.global_suppressions OK
+mtr.test_suppressions OK
performance_schema
test
-Phase 3/3: Running 'mysql_fix_privilege_tables'...
OK