bk commit into 5.1 tree (knielsen:1.2209) BUG#20677

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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
  1.2209 06/06/25 08:59:44 knielsen@stripped +2 -0
  BUG#20677: Sporadic failure of test case 'ndb_binlog_multi'.
  
  Start test case with a dummy table create and drop. This ensures that
  NDB event subscription is properly set up before the real test starts,
  which otherwise could sometimes cause INSERT events to be lost.

  mysql-test/t/ndb_binlog_multi.test
    1.5 06/06/25 08:59:40 knielsen@stripped +9 -2
    Start test with dummy table create/drop to avoid a race.

  mysql-test/r/ndb_binlog_multi.result
    1.5 06/06/25 08:59:40 knielsen@stripped +4 -2
    Start test with dummy table create/drop to avoid a race.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-pristine

--- 1.4/mysql-test/r/ndb_binlog_multi.result	2006-03-13 09:55:32 +01:00
+++ 1.5/mysql-test/r/ndb_binlog_multi.result	2006-06-25 08:59:40 +02:00
@@ -1,5 +1,7 @@
-drop table if exists t1,t2;
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3;
+drop table if exists t1,t2,t3;
+CREATE TABLE t3 (dummy INT PRIMARY KEY) ENGINE = NDB;
+DROP TABLE t3;
 reset master;
 reset master;
 CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB;

--- 1.4/mysql-test/t/ndb_binlog_multi.test	2006-03-13 09:55:32 +01:00
+++ 1.5/mysql-test/t/ndb_binlog_multi.test	2006-06-25 08:59:40 +02:00
@@ -4,10 +4,17 @@
 
 --disable_warnings
 connection server2;
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3;
 connection server1;
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3;
 --enable_warnings
+
+# Dummy table create/drop to avoid a race where table is created
+# before event subscription is set up, causing test failure (BUG#20677).
+connection server2;
+CREATE TABLE t3 (dummy INT PRIMARY KEY) ENGINE = NDB;
+connection server1;
+DROP TABLE t3;
 
 # reset for test
 connection server1;