diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-04 22:00:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-04 22:00:24 +0200 |
| commit | 49c853fb948aeaeb5c7e3f02da3f14da51ee4100 (patch) | |
| tree | 8c3d487a02209cc0c6f126144f1340fc5897d527 /mysql-test/r/mysql_upgrade_no_innodb.result | |
| parent | ae18a28500974351cf42fa3cac67c83e0647d510 (diff) | |
| parent | 4c87f727734955f9e4a0ffde25aae4d43ec0b2a5 (diff) | |
| download | mariadb-git-49c853fb948aeaeb5c7e3f02da3f14da51ee4100.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/r/mysql_upgrade_no_innodb.result')
| -rw-r--r-- | mysql-test/r/mysql_upgrade_no_innodb.result | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/r/mysql_upgrade_no_innodb.result b/mysql-test/r/mysql_upgrade_no_innodb.result index e65c6ae05f7..acbca131587 100644 --- a/mysql-test/r/mysql_upgrade_no_innodb.result +++ b/mysql-test/r/mysql_upgrade_no_innodb.result @@ -1,5 +1,5 @@ The --upgrade-system-tables option was used, user tables won't be touched. -Phase 1/5: Checking mysql database +Phase 1/6: Checking and upgrading mysql database Processing databases mysql mysql.column_stats OK @@ -42,6 +42,9 @@ error : Corrupt mysql.innodb_table_stats Error : Unknown storage engine 'InnoDB' error : Corrupt -Phase 2/5: Running 'mysql_fix_privilege_tables'... -Phase 5/5: Running 'FLUSH PRIVILEGES'... +Phase 2/6: Fixing views... Skipped +Phase 3/6: Running 'mysql_fix_privilege_tables' +Phase 4/6: Fixing table and database names ... Skipped +Phase 5/6: Checking and upgrading tables... Skipped +Phase 6/6: Running 'FLUSH PRIVILEGES' OK |