bk commit into 5.1 tree (malff:1.2584)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-08-31 15:51:57-06:00, malff@weblab.(none) +1 -0
  Fixed timing issues in events.test

  mysql-test/t/events.test@stripped, 2007-08-31 15:51:55-06:00, malff@weblab.(none) +11 -2
    
    Wait for the select get_lock() to actually get the lock
    wait for release_lock() to actually release the lock

diff -Nrup a/mysql-test/t/events.test b/mysql-test/t/events.test
--- a/mysql-test/t/events.test	2007-08-31 08:49:40 -06:00
+++ b/mysql-test/t/events.test	2007-08-31 15:51:55 -06:00
@@ -453,7 +453,8 @@ create event закачка on schedule 
 
 --echo "Should have only 2 processes: the scheduler and the locked event"
 let $wait_condition= select count(*) = 2 from information_schema.processlist
-  where (info like "select get_lock%" OR user='event_scheduler');
+  where ( (state like 'User lock%' AND info like 'select get_lock%')
+       OR (command='Daemon' AND user='event_scheduler'));
 --source include/wait_condition.inc
 
 select /*2*/ user, host, db, command, state, info
@@ -464,6 +465,13 @@ select /*2*/ user, host, db, command, st
 select release_lock("test_lock2");
 drop event закачка;
 
+# Wait for release_lock("test_lock2") to complete,
+# to avoid polluting the next test information_schema.processlist
+let $wait_condition= select count(*) = 0 from information_schema.processlist
+  where (state like 'User lock%' AND info like 'select get_lock%');
+--source include/wait_condition.inc
+
+
 ##
 ## 1. get a lock
 ## 2. create an event
@@ -478,7 +486,8 @@ create event закачка21 on schedul
 
 --echo "Should have only 2 processes: the scheduler and the locked event"
 let $wait_condition= select count(*) = 2 from information_schema.processlist
-  where (info like "select get_lock%" OR user='event_scheduler');
+  where ( (state like 'User lock%' AND info like 'select get_lock%')
+       OR (command='Daemon' AND user='event_scheduler'));
 --source include/wait_condition.inc
 
 select /*3*/ user, host, db, command, state, info