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

11
mysql-test/r/mysql_upgrade_ssl.result
View File

@ -1,7 +1,7 @@
#
# Bug#55672 mysql_upgrade dies with internal error
#
Phase 1/5: Checking mysql database
Phase 1/6: Checking and upgrading mysql database
Processing databases
mysql
mysql.column_stats OK
@ -32,9 +32,10 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK
mysql.time_zone_transition_type OK
mysql.user OK
Phase 2/5: Running 'mysql_fix_privilege_tables'...
Phase 3/5: Fixing table and database names
Phase 4/5: Checking and upgrading tables
Phase 2/6: Fixing views
Phase 3/6: Running 'mysql_fix_privilege_tables'
Phase 4/6: Fixing table and database names
Phase 5/6: Checking and upgrading tables
Processing databases
information_schema
mtr
@ -42,5 +43,5 @@ mtr.global_suppressions OK
mtr.test_suppressions OK
performance_schema
test
Phase 5/5: Running 'FLUSH PRIVILEGES'...
Phase 6/6: Running 'FLUSH PRIVILEGES'
OK