From 99a4f96535b440398d5702d9718e11539f7c2256 Mon Sep 17 00:00:00 2001
From: "mskold/marty@mysql.com/linux.site" <>
Date: Wed, 20 Sep 2006 16:46:54 +0200
Subject: [PATCH] Bug#18976  CRBR: multiple binlog, second binlog may miss
 schema log events:Change test back to verify again

---
 mysql-test/r/ndb_binlog_ddl_multi.result | 12 ++++++------
 mysql-test/t/ndb_binlog_ddl_multi.test   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/ndb_binlog_ddl_multi.result b/mysql-test/r/ndb_binlog_ddl_multi.result
index f3e9b23920d..19414cf75c5 100644
--- a/mysql-test/r/ndb_binlog_ddl_multi.result
+++ b/mysql-test/r/ndb_binlog_ddl_multi.result
@@ -27,13 +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;
-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
-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
 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
+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
 reset master;
 reset master;
 use test;
diff --git a/mysql-test/t/ndb_binlog_ddl_multi.test b/mysql-test/t/ndb_binlog_ddl_multi.test
index f41e7c3a527..78cec137159 100644
--- a/mysql-test/t/ndb_binlog_ddl_multi.test
+++ b/mysql-test/t/ndb_binlog_ddl_multi.test
@@ -60,8 +60,8 @@ ALTER DATABASE mysqltest CHARACTER SET latin1;
 
 # 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 server2
+drop table mysqltest.t1;
 
 --connection server1
 --source include/show_binlog_events.inc
@@ -69,8 +69,8 @@ ALTER DATABASE mysqltest CHARACTER SET latin1;
 --real_sleep 10
 --source include/show_binlog_events.inc
 
---connection server2
-drop table mysqltest.t1;
+#--connection server2
+#drop table mysqltest.t1;
 
 # drop database and drop should come after data events
 --connection server1