diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-16 00:30:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-16 00:30:29 +0200 |
| commit | 1e79138459038c39c85239a825bf1727ef43c156 (patch) | |
| tree | 88f725551c0f061487fde0ee5a6c0ea471b24abc /mysql-test/r/log_tables_upgrade.result | |
| parent | 7aed441963823191e94da3df069e123dc8794eee (diff) | |
| parent | 42f359f9827340bf430a9f1a0bda9b059951ea08 (diff) | |
| download | mariadb-git-1e79138459038c39c85239a825bf1727ef43c156.tar.gz | |
Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1
Diffstat (limited to 'mysql-test/r/log_tables_upgrade.result')
| -rw-r--r-- | mysql-test/r/log_tables_upgrade.result | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mysql-test/r/log_tables_upgrade.result b/mysql-test/r/log_tables_upgrade.result index 6f7bd64eba3..9900f6d6b5a 100644 --- a/mysql-test/r/log_tables_upgrade.result +++ b/mysql-test/r/log_tables_upgrade.result @@ -11,13 +11,8 @@ Table Op Msg_type Msg_text test.bug49823 repair status OK RENAME TABLE general_log TO renamed_general_log; RENAME TABLE test.bug49823 TO general_log; -Phase 1/3: Fixing table and database names -Phase 2/3: Checking and upgrading tables +Phase 1/4: Checking mysql database Processing databases -information_schema -mtr -mtr.global_suppressions OK -mtr.test_suppressions OK mysql mysql.column_stats OK mysql.columns_priv OK @@ -48,9 +43,16 @@ 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 +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 DROP TABLE general_log; RENAME TABLE renamed_general_log TO general_log; |