bk commit into 5.1 tree (mskold:1.2316) BUG#18976

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-20 16:46:54+02:00, mskold@stripped +2 -0
  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@stripped, 2006-09-20 16:46:28+02:00,
mskold@stripped +1 -1
    Bug#18976  CRBR: multiple binlog, second binlog may miss schema log events:Change test
back to verify again

  mysql-test/t/ndb_binlog_ddl_multi.test@stripped, 2006-09-20 16:46:28+02:00, mskold@stripped
+4 -4
    Bug#18976  CRBR: multiple binlog, second binlog may miss schema log events:Change test
back to verify again

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb

--- 1.12/mysql-test/r/ndb_binlog_ddl_multi.result	2006-09-20 16:47:03 +02:00
+++ 1.13/mysql-test/r/ndb_binlog_ddl_multi.result	2006-09-20 16:47:03 +02:00
@@ -27,13 +27,13 @@ master-bin1.000001	#	Query	#	#	use `test
 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
 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;
 reset master;
 reset master;
 use test;

--- 1.12/mysql-test/t/ndb_binlog_ddl_multi.test	2006-09-20 16:47:03 +02:00
+++ 1.13/mysql-test/t/ndb_binlog_ddl_multi.test	2006-09-20 16:47:03 +02:00
@@ -60,8 +60,8 @@ ALTER DATABASE mysqltest CHARACTER SET l
 
 # 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 l
 --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