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

Update result file for mysql_upgrade as we have more tables that is checked in 5.1

Browse Source 
Fix merge errors
This commit is contained in:
msvensson@neptunus.(none)
2006-11-15 13:22:38 +01:00
parent 9f22fecf72
commit c9b4603f90
5 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mysql-test/r/mysql_upgrade.result
View File

@ -1,14 +1,19 @@
Run mysql_upgrade once
cluster.binlog_index OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
mysql.general_log OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
mysql.help_topic OK
mysql.host OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.slow_log OK
mysql.tables_priv OK
mysql.time_zone OK
mysql.time_zone_leap_second OK
@ -46,6 +51,18 @@ mysql.user OK
1
1
1
@hadEventPriv :=1
1
1
1
1
1
@hadTriggerPriv :=1
1
1
1
1
1
Run it again - should say already completed
@hadGrantPriv:=1
1
@ -77,17 +94,34 @@ Run it again - should say already completed
1
1
1
@hadEventPriv :=1
1
1
1
1
1
@hadTriggerPriv :=1
1
1
1
1
1
Force should run it regardless of wheter it's been run before
cluster.binlog_index OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
mysql.general_log OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
mysql.help_topic OK
mysql.host OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.slow_log OK
mysql.tables_priv OK
mysql.time_zone OK
mysql.time_zone_leap_second OK
@ -125,3 +159,15 @@ mysql.user OK
1
1
1
@hadEventPriv :=1
1
1
1
1
1
@hadTriggerPriv :=1
1
1
1
1
1