Merge fixes for new test cases

This commit is contained in:
unknown 2006-11-29 18:35:33 +01:00
parent d988576610
commit 74ff94ec31
3 changed files with 4 additions and 4 deletions

View file

@ -1,5 +1,5 @@
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

View file

@ -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

View file

@ -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