database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-05-04 22:00:24 +02:00
parent ae18a28500 4c87f72773
commit 49c853fb94
179 changed files with 5739 additions and 1214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/mysql_upgrade_no_innodb.result
View File

@ -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