mirror of
https://github.com/MariaDB/server.git
synced 2025-10-30 04:26:45 +03:00
6554d1ac1e
Fix merge errors mysql-test/r/mysql_upgrade.result: Update result file for mysql_upgrade mysql-test/r/mysqldump.result: Merge error mysql-test/r/rpl_drop_db.result: Merge error mysql-test/r/rpl_row_max_relay_size.result: Merge error mysql-test/t/rpl_drop_db.test: Merge error
174 lines
3.1 KiB
Plaintext
174 lines
3.1 KiB
Plaintext
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
|
|
mysql.time_zone_name OK
|
|
mysql.time_zone_transition OK
|
|
mysql.time_zone_transition_type OK
|
|
mysql.user OK
|
|
@hadGrantPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadShowDbPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateViewPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateRoutinePriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateUserPriv:=1
|
|
1
|
|
1
|
|
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
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadShowDbPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateViewPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateRoutinePriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateUserPriv:=1
|
|
1
|
|
1
|
|
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
|
|
mysql.time_zone_name OK
|
|
mysql.time_zone_transition OK
|
|
mysql.time_zone_transition_type OK
|
|
mysql.user OK
|
|
@hadGrantPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadShowDbPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateViewPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateRoutinePriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadCreateUserPriv:=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadEventPriv :=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
@hadTriggerPriv :=1
|
|
1
|
|
1
|
|
1
|
|
1
|
|
1
|