summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <malff@omega.weblab>2007-09-05 12:14:43 -0600
committerunknown <malff@omega.weblab>2007-09-05 12:14:43 -0600
commit712b9b00fb0820b8fa4d674373109151a87c2430 (patch)
tree20c12db18740b71ce892bd50e34f0863eff50fa7
parentddf8272b756314d49065845118b322080461a2cf (diff)
downloadmariadb-git-712b9b00fb0820b8fa4d674373109151a87c2430.tar.gz
Test events_logs_tests cleanup
Fixed test failure under heavy load, in case truncate table is slow. mysql-test/r/events_logs_tests.result: Fixed test failure under heavy load, in case truncate table is slow. mysql-test/t/events_logs_tests.test: Fixed test failure under heavy load, in case truncate table is slow.
-rw-r--r--mysql-test/r/events_logs_tests.result6
-rw-r--r--mysql-test/t/events_logs_tests.test6
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;