bk commit into 5.0 tree (dlenev:1.2002)

[dlenev]

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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.2002 05/09/23 16:59:19 dlenev@stripped +2 -0
  Fixed race conditions in rpl_multi_update and rpl_multi_delete tests which
  caused spurious test failures.

  mysql-test/t/rpl_multi_update.test
    1.10 05/09/23 16:59:11 dlenev@stripped +1 -1
    Fixed race condition in test that caused spurious test failure.
    To have predictable result from statements which are run on slave we
    need to sync master and slave explicitly.

  mysql-test/t/rpl_multi_delete.test
    1.6 05/09/23 16:59:11 dlenev@stripped +1 -1
    Fixed race condition in test that caused spurious test failure.
    To have predictable result from statements which are run on slave we
    need to sync master and slave explicitly.

# 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:	dlenev
# Host:	brandersnatch.localdomain
# Root:	/home/dlenev/src/mysql-5.0-rmuqf

--- 1.5/mysql-test/t/rpl_multi_delete.test	2005-09-20 19:41:42 +04:00
+++ 1.6/mysql-test/t/rpl_multi_delete.test	2005-09-23 16:59:11 +04:00
@@ -24,7 +24,7 @@
 delete from t1;
 delete from t2;
 
-connection slave;
+sync_slave_with_master;
 # force a difference to see if master's multi-DELETE will correct it
 insert into t1 values(1);
 insert into t2 values(1);

--- 1.9/mysql-test/t/rpl_multi_update.test	2005-09-20 19:41:42 +04:00
+++ 1.10/mysql-test/t/rpl_multi_update.test	2005-09-23 16:59:11 +04:00
@@ -33,7 +33,7 @@
 insert into t1 values(1,1);
 insert into t2 values(1,1);
 
-connection slave;
+sync_slave_with_master;
 # force a difference to see if master's multi-UPDATE will correct it
 update t1 set a=2;