From 43e5ab75cab6a8c9e36898d561c5148ae7591304 Mon Sep 17 00:00:00 2001
From: "malff@omega.weblab" <>
Date: Wed, 5 Sep 2007 12:14:43 -0600
Subject: [PATCH] Test events_logs_tests cleanup Fixed test failure under heavy
 load, in case truncate table is slow.

---
 mysql-test/r/events_logs_tests.result | 6 ++++--
 mysql-test/t/events_logs_tests.test   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/events_logs_tests.result b/mysql-test/r/events_logs_tests.result
index fb658b4a83b..b7faf56f466 100644
--- a/mysql-test/r/events_logs_tests.result
+++ b/mysql-test/r/events_logs_tests.result
@@ -52,7 +52,8 @@ do select 'events_logs_test' as inside_event, sleep(1.5);
 
 Nothing should be logged
 
-select user_host, db, sql_text from mysql.slow_log where sql_text not like 'create event%';
+select user_host, db, sql_text from mysql.slow_log
+where sql_text like 'select \'events_logs_test\'%';
 user_host	db	sql_text
 set @@global.long_query_time=1;
 truncate mysql.slow_log;
@@ -61,7 +62,8 @@ do select 'events_logs_test' as inside_event, sleep(1.5);
 
 Event sub-statement should be logged.
 
-select user_host, db, sql_text from mysql.slow_log where sql_text not like 'create event%';
+select user_host, db, sql_text from mysql.slow_log
+where sql_text like 'select \'events_logs_test\'%';
 user_host	db	sql_text
 USER_HOST	events_test	select 'events_logs_test' as inside_event, sleep(1.5)
 drop database events_test;
diff --git a/mysql-test/t/events_logs_tests.test b/mysql-test/t/events_logs_tests.test
index b9ceec2ed82..3240dccbc76 100644
--- a/mysql-test/t/events_logs_tests.test
+++ b/mysql-test/t/events_logs_tests.test
@@ -61,7 +61,8 @@ create event ev_log_general on schedule at now() on completion not preserve
 --echo Nothing should be logged
 --echo
 --replace_column 1 USER_HOST
-select user_host, db, sql_text from mysql.slow_log where sql_text not like 'create event%';
+select user_host, db, sql_text from mysql.slow_log
+  where sql_text like 'select \'events_logs_test\'%';
 set @@global.long_query_time=1;
 truncate mysql.slow_log;
 create event ev_log_general on schedule at now() on completion not preserve
@@ -72,7 +73,8 @@ create event ev_log_general on schedule at now() on completion not preserve
 --echo Event sub-statement should be logged.
 --echo 
 --replace_column 1 USER_HOST
-select user_host, db, sql_text from mysql.slow_log where sql_text not like 'create event%';
+select user_host, db, sql_text from mysql.slow_log
+  where sql_text like 'select \'events_logs_test\'%';
 
 drop database events_test;
 set global event_scheduler=off;