List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:February 15 2008 9:24am
Subject:bk commit into 5.1 tree (mkindahl:1.2554)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl 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, 2008-02-15 10:24:13+01:00, mkindahl@stripped +1 -0
  Adding waits to events_scheduling to prevent the test from
  failing on heavily loaded systems.

  mysql-test/t/events_scheduling.test@stripped, 2008-02-15 10:24:02+01:00, mkindahl@stripped +12 -1
    Adding waits before statements since the scheduler is unpredictable
    on loaded systems and might be delayed.

diff -Nrup a/mysql-test/t/events_scheduling.test b/mysql-test/t/events_scheduling.test
--- a/mysql-test/t/events_scheduling.test	2008-02-13 12:41:45 +01:00
+++ b/mysql-test/t/events_scheduling.test	2008-02-15 10:24:02 +01:00
@@ -76,11 +76,22 @@ let $wait_condition=select count(*) = 0 
 where event_name='event_4' and status='enabled';
 --source include/wait_condition.inc
 
-# check the data
+# Wait for the events to fire and check the data afterwards
 
+let $wait_condition=SELECT SUM(a) >= 4 FROM table_1;
+source include/wait_condition.inc;
 SELECT IF(SUM(a) >= 4, 'OK', 'ERROR') FROM table_1;
+
+let $wait_condition=SELECT SUM(a) >= 5 FROM table_2;
+source include/wait_condition.inc;
 SELECT IF(SUM(a) >= 5, 'OK', 'ERROR') FROM table_2;
+
+let $wait_condition=SELECT SUM(a) >= 1 FROM table_3;
+source include/wait_condition.inc;
 SELECT IF(SUM(a) >= 1, 'OK', 'ERROR') FROM table_3;
+
+let $wait_condition=SELECT SUM(a) >= 1 FROM table_4;
+source include/wait_condition.inc;
 SELECT IF(SUM(a) >= 1, 'OK', 'ERROR') FROM table_4;
 
 SELECT IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR')
Thread
bk commit into 5.1 tree (mkindahl:1.2554)Mats Kindahl15 Feb