From d2f32b1053e30245ef7f7d38b04a927abea74945 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 31 Aug 2007 15:51:57 -0600 Subject: [PATCH] Fixed timing issues in events.test mysql-test/t/events.test: Wait for the select get_lock() to actually get the lock wait for release_lock() to actually release the lock --- mysql-test/t/events.test | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test index 365318e1db9..20134765609 100644 --- a/mysql-test/t/events.test +++ b/mysql-test/t/events.test @@ -453,7 +453,8 @@ create event закачка on schedule every 10 hour do select get_lock("test_l --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, state, info 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 schedule every 10 hour do select get_lock("test --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