bk commit into 5.1 tree (knielsen:1.2032) BUG#14931

[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.2032 06/01/04 15:25:51 knielsen@stripped +4 -0
  BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
  the bug is fixed.

  mysql-test/t/rpl_stm_sp.test
    1.11 06/01/04 15:24:55 knielsen@stripped +8 -0
    BUG#14931: Temporarily add synchronization to avoid sporadic failures until
    the bug is fixed.

  mysql-test/r/rpl_stm_sp.result
    1.15 06/01/04 15:24:55 knielsen@stripped +3 -0
    BUG#14931: Temporarily add synchronization to avoid sporadic failures until
    the bug is fixed.

  mysql-test/r/rpl_row_sp000.result
    1.2 06/01/04 15:24:55 knielsen@stripped +3 -0
    BUG#14931: Temporarily add synchronization to avoid sporadic failures until
    the bug is fixed.

  mysql-test/t/rpl_row_sp000.test
    1.2 06/01/04 15:24:54 knielsen@stripped +8 -0
    BUG#14931: Temporarily add synchronization to avoid sporadic failures until
    the bug is fixed.

# 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-new

--- 1.14/mysql-test/r/rpl_stm_sp.result	2005-12-22 05:10:53 +01:00
+++ 1.15/mysql-test/r/rpl_stm_sp.result	2006-01-04 15:24:55 +01:00
@@ -57,6 +57,9 @@
 grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1;
 grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1;
 grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1;
+SELECT 1;
+1
+1
 create procedure foo4()
 deterministic
 begin

--- 1.10/mysql-test/t/rpl_stm_sp.test	2005-12-22 05:10:55 +01:00
+++ 1.11/mysql-test/t/rpl_stm_sp.test	2006-01-04 15:24:55 +01:00
@@ -90,6 +90,14 @@
 grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1;
 grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1;
 
+# ToDo: BUG#14931: There is a race between the last grant binlogging, and
+# the binlogging in the new connection made below, causing sporadic test
+# failures due to switched statement order in binlog. To fix this we do
+# SELECT 1 in the first connection before starting the second, ensuring
+# that binlogging is done in the expected order.
+# Please remove this SELECT 1 when BUG#14931 is fixed.
+SELECT 1;
+
 connect (con1,127.0.0.1,zedjzlcsjhd,,mysqltest1,$MASTER_MYPORT,);
 connection con1;
 

--- 1.1/mysql-test/r/rpl_row_sp000.result	2005-12-22 06:34:54 +01:00
+++ 1.2/mysql-test/r/rpl_row_sp000.result	2006-01-04 15:24:55 +01:00
@@ -58,6 +58,9 @@
 grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1;
 grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1;
 grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1;
+SELECT 1;
+1
+1
 create procedure foo4()
 deterministic
 begin

--- 1.1/mysql-test/t/rpl_row_sp000.test	2005-12-22 06:35:03 +01:00
+++ 1.2/mysql-test/t/rpl_row_sp000.test	2006-01-04 15:24:54 +01:00
@@ -82,6 +82,14 @@
 grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1;
 grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1;
 
+# ToDo: BUG#14931: There is a race between the last grant binlogging, and
+# the binlogging in the new connection made below, causing sporadic test
+# failures due to switched statement order in binlog. To fix this we do
+# SELECT 1 in the first connection before starting the second, ensuring
+# that binlogging is done in the expected order.
+# Please remove this SELECT 1 when BUG#14931 is fixed.
+SELECT 1;
+
 connect (con1,127.0.0.1,zedjzlcsjhd,,mysqltest1,$MASTER_MYPORT,);
 connection con1;