summaryrefslogtreecommitdiff
path: root/mysql-test/t/events_logs_tests.test
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.local>2007-03-22 00:09:50 +0300
committerunknown <kostja@bodhi.local>2007-03-22 00:09:50 +0300
commit20fd65ff836533398c47567855cf42ef89c2414a (patch)
tree762ae84ca88d38f5c5734d7557bce9b4c00375f3 /mysql-test/t/events_logs_tests.test
parent817442e873d53573379d63bfc1b57f526609c810 (diff)
downloadmariadb-git-20fd65ff836533398c47567855cf42ef89c2414a.tar.gz
Try to fix events_logs_tests race on Windows.
mysql-test/t/events_logs_tests.test: Try to fix a race condition that breaks this test on Windows.
Diffstat (limited to 'mysql-test/t/events_logs_tests.test')
-rw-r--r--mysql-test/t/events_logs_tests.test6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/events_logs_tests.test b/mysql-test/t/events_logs_tests.test
index 64ce4a5c3df..25b75f13f01 100644
--- a/mysql-test/t/events_logs_tests.test
+++ b/mysql-test/t/events_logs_tests.test
@@ -89,10 +89,12 @@ DROP EVENT long_event;
SET GLOBAL long_query_time=1;
CREATE EVENT long_event2 ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(2);
--echo "Sleep some more time than the actual event run will take"
---sleep 2.5
+let $wait_timeout= 30;
+let $wait_condition= SELECT COUNT(*) = 1 FROM mysql.slow_log;
+--source include/wait_condition.inc
--echo "Check our table. Should see 2 rows"
SELECT * FROM slow_event_test;
---echo "Check slow log. Should see 1 row because 4 is over the threshold of 3 for GLOBAL, though under SESSION which is 10"
+--echo "Check slow log. Should see 1 row because 2 is over the threshold of 1 for GLOBAL, though under SESSION which is 10"
--replace_column 1 USER_HOST 2 SLEEPVAL
SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;
DROP EVENT long_event2;