bk commit into 5.1 tree (gkodinov:1.2564) BUG#28991

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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, 2007-06-14 12:53:13+03:00, gkodinov@stripped +1 -0
  Bug #28991: rpl_events failure in pushbuild
  
  In tests waiting on a timeout is not deterministic enough
  to make sure that an event actually finished executing.
  Fixed the test by waiting in a loop and checking the effect
  that the event is supposed to produce.

  mysql-test/include/rpl_events.inc@stripped, 2007-06-14 12:53:12+03:00, gkodinov@stripped +3 -0
    Bug #28991: wait until event has taken effect

# 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:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/work/B28991-5.1-opt

--- 1.4/mysql-test/include/rpl_events.inc	2007-03-30 19:16:43 +03:00
+++ 1.5/mysql-test/include/rpl_events.inc	2007-06-14 12:53:12 +03:00
@@ -29,6 +29,9 @@ SELECT db, name, status, originator FROM
 
 # wait 3 seconds, so the event can trigger
 --real_sleep 3
+let $wait_condition= 
+  SELECT count(*) = 1 FROM t1 WHERE c = 'from justonce';
+--source include/wait_condition.inc  
 
 # check that table t1 contains something
 --echo "in the master"