Commit 74ff94ec authored by unknown's avatar unknown
Browse files

Merge fixes for new test cases

parent d9885766

mysql-test/r/mysql_upgrade.result

+2 −2
Original line number Diff line number Diff line 
Run mysql_upgrade once

cluster.binlog_index                               OK

mysql.binlog_index                                 OK

mysql.columns_priv                                 OK

mysql.db                                           OK

mysql.event                                        OK
@@ -107,7 +107,7 @@ Run it again - should say already completed 
1

1

Force should run it regardless of wheter it's been run before

cluster.binlog_index                               OK

mysql.binlog_index                                 OK

mysql.columns_priv                                 OK

mysql.db                                           OK

mysql.event                                        OK

mysql-test/t/system_mysql_db_fix40123.test

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ CREATE TABLE time_zone_leap_second ( Transition_time bigint signed NOT NULL, 
-- disable_query_log



# Drop all tables created by this test

DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event;

DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, binlog_index;



-- enable_query_log

mysql-test/t/system_mysql_db_fix50030.test

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ CREATE TABLE procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char( 
-- disable_query_log



# Drop all tables created by this test

DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event;

DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, binlog_index;



-- enable_query_log