diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index a031b440b17..a65020754be 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -1,173 +1,3 @@ Run mysql_upgrade once -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.ndb_binlog_index 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 -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.ndb_binlog_index 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