diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 21:24:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-29 12:40:52 +0200 |
| commit | 6f17e233bf7f4de20dda8fb31f63aa52452c4e0a (patch) | |
| tree | 0163788e8e192b2eb76e8abe807c02687afd02a0 /mysql-test/r/log_tables_upgrade.result | |
| parent | f9c02d7c29e7ddc9fa274e7fe23e5800653660f4 (diff) | |
| download | mariadb-git-6f17e233bf7f4de20dda8fb31f63aa52452c4e0a.tar.gz | |
post-merge fixes
Diffstat (limited to 'mysql-test/r/log_tables_upgrade.result')
| -rw-r--r-- | mysql-test/r/log_tables_upgrade.result | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/r/log_tables_upgrade.result b/mysql-test/r/log_tables_upgrade.result index 5ed59eecc31..e68b34ed18d 100644 --- a/mysql-test/r/log_tables_upgrade.result +++ b/mysql-test/r/log_tables_upgrade.result @@ -11,8 +11,9 @@ 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: Fixing views +Phase 2/4: Fixing table and database names +Phase 3/4: Checking and upgrading tables Processing databases information_schema mtr @@ -44,7 +45,7 @@ mysql.time_zone_transition_type OK mysql.user OK performance_schema test -Phase 3/3: Running 'mysql_fix_privilege_tables'... +Phase 4/4: Running 'mysql_fix_privilege_tables' OK DROP TABLE general_log; RENAME TABLE renamed_general_log TO general_log; |