BUG#18976 test workaround

3 files changed, 14 insertions, 21 deletions

diff --git a/mysql-test/r/ndb_binlog_ddl_multi.result b/mysql-test/r/ndb_binlog_ddl_multi.result
index abd7f6a875c..f3e9b23920d 100644
--- a/mysql-test/r/ndb_binlog_ddl_multi.result
+++ b/mysql-test/r/ndb_binlog_ddl_multi.result
@@ -27,15 +27,13 @@ master-bin1.000001	#	Query	#	#	use `test`; alter table t2 add column (b int)
 reset master;
 reset master;
 ALTER DATABASE mysqltest CHARACTER SET latin1;
-drop table mysqltest.t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	ALTER DATABASE mysqltest CHARACTER SET latin1
-master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `t1`
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	ALTER DATABASE mysqltest CHARACTER SET latin1
-master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `t1`
+drop table mysqltest.t1;
 reset master;
 reset master;
 use test;
@@ -83,7 +81,6 @@ DROP TABLESPACE ts1
 ENGINE = NDB;
 DROP LOGFILE GROUP lg1 
 ENGINE =NDB;
-drop table t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin1.000001	#	Query	#	#	CREATE LOGFILE GROUP lg1
@@ -114,7 +111,6 @@ master-bin1.000001	#	Query	#	#	DROP TABLESPACE ts1
 ENGINE = NDB
 master-bin1.000001	#	Query	#	#	DROP LOGFILE GROUP lg1 
 ENGINE =NDB
-master-bin1.000001	#	Query	#	#	use `test`; drop table `t1`
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin1.000001	#	Query	#	#	CREATE LOGFILE GROUP lg1
@@ -145,7 +141,7 @@ master-bin1.000001	#	Query	#	#	DROP TABLESPACE ts1
 ENGINE = NDB
 master-bin1.000001	#	Query	#	#	DROP LOGFILE GROUP lg1 
 ENGINE =NDB
-master-bin1.000001	#	Query	#	#	use `test`; drop table `t1`
+drop table t1;
 reset master;
 show tables;
 Tables_in_test
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 8fd40eddf39..837ef58c3c9 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -15,7 +15,7 @@ events                   : BUG#17619 2006-02-21 andrey  Test case unstable
 events_logs_tests        : BUG#18953 2006-04-12 kent    Test is randomly failing
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
-ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
+#ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
 ndb_cache2               : BUG#18597 2006-03-28 brian simultaneous drop table and ndb statistics update triggers node failure
 ndb_cache_multi2         : BUG#18597 2006-04-10 kent  simultaneous drop table and ndb statistics update triggers node failure
 #ndb_gis                  : BUG#18600 2006-03-28 brian ndb_gis test failure
@@ -47,13 +47,3 @@ rpl_until                : BUG#15886 2006-02-16 jmiller Unstable test case
 sp-goto                  : BUG#18949 2006-02-16 jmiller GOTO is currently is disabled - will be fixed in the future
 mysqldump                : BUG#18078 2006-03-10 lars
 udf                      : BUG#18564 2006-03-27 ian     (Permission by Brian)
-
-#ndb_alter_table_row      : sometimes wrong error 1015!=1046
-#ndb_binlog_basic         : Results are not deterministic, Tomas will fix
-#ndb_binlog_multi         : Results are not deterministic, Tomas will fix
-#rpl_bit_npk              : Bug#13418
-#rpl_ddl                  : Bug#15963 SBR does not show "Definer" correctly
-#rpl_ndb_blob             : interferes with following tests, causing hang
-#rpl_ndb_blob2            : interferes with following tests, causing hang
-#rpl_ndb_delete_nowhere   : Bug#17400: delete & update of rows in table without pk fails
-#rpl_ndb_multi_update3    : Bug#17400: delete & update of rows in table without pk fails
diff --git a/mysql-test/t/ndb_binlog_ddl_multi.test b/mysql-test/t/ndb_binlog_ddl_multi.test
index 9a96e89b56e..f41e7c3a527 100644
--- a/mysql-test/t/ndb_binlog_ddl_multi.test
+++ b/mysql-test/t/ndb_binlog_ddl_multi.test
@@ -58,9 +58,10 @@ reset master;
 ALTER DATABASE mysqltest CHARACTER SET latin1;
 
 
-# drop table and drop should come after data events
---connection server2
-drop table mysqltest.t1;
+# having drop here instead of below sometimes triggers bug#18976
+## drop table and drop should come after data events
+#--connection server2
+#drop table mysqltest.t1;
 
 --connection server1
 --source include/show_binlog_events.inc
@@ -68,6 +69,9 @@ drop table mysqltest.t1;
 --real_sleep 10
 --source include/show_binlog_events.inc
 
+--connection server2
+drop table mysqltest.t1;
+
 # drop database and drop should come after data events
 --connection server1
 reset master;
@@ -129,7 +133,8 @@ ENGINE = NDB;
 DROP LOGFILE GROUP lg1 
 ENGINE =NDB;
 
-drop table t1;
+# having drop here instead of below sometimes triggers bug#18976
+#drop table t1;
 
 --connection server2
 --source include/show_binlog_events.inc
@@ -137,6 +142,8 @@ drop table t1;
 --real_sleep 10
 --source include/show_binlog_events.inc
 
+drop table t1;
+
 #
 # Bug #17827 cluster: rename of several tables in one statement,
 # gets multiply logged