Commit 712b9b00 authored by unknown's avatar unknown

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.
parent ddf8272b
...@@ -52,7 +52,8 @@ do select 'events_logs_test' as inside_event, sleep(1.5); ...@@ -52,7 +52,8 @@ do select 'events_logs_test' as inside_event, sleep(1.5);
Nothing should be logged 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 user_host db sql_text
set @@global.long_query_time=1; set @@global.long_query_time=1;
truncate mysql.slow_log; truncate mysql.slow_log;
...@@ -61,7 +62,8 @@ do select 'events_logs_test' as inside_event, sleep(1.5); ...@@ -61,7 +62,8 @@ do select 'events_logs_test' as inside_event, sleep(1.5);
Event sub-statement should be logged. 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 db sql_text
USER_HOST events_test select 'events_logs_test' as inside_event, sleep(1.5) USER_HOST events_test select 'events_logs_test' as inside_event, sleep(1.5)
drop database events_test; drop database events_test;
......
...@@ -61,7 +61,8 @@ create event ev_log_general on schedule at now() on completion not preserve ...@@ -61,7 +61,8 @@ create event ev_log_general on schedule at now() on completion not preserve
--echo Nothing should be logged --echo Nothing should be logged
--echo --echo
--replace_column 1 USER_HOST --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; set @@global.long_query_time=1;
truncate mysql.slow_log; truncate mysql.slow_log;
create event ev_log_general on schedule at now() on completion not preserve 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 ...@@ -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 Event sub-statement should be logged.
--echo --echo
--replace_column 1 USER_HOST --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; drop database events_test;
set global event_scheduler=off; set global event_scheduler=off;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment