diff options
Diffstat (limited to 'mysql-test/t/events_logs_tests.test')
-rw-r--r-- | mysql-test/t/events_logs_tests.test | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/mysql-test/t/events_logs_tests.test b/mysql-test/t/events_logs_tests.test index 28818083efa..62c2aedf6cc 100644 --- a/mysql-test/t/events_logs_tests.test +++ b/mysql-test/t/events_logs_tests.test @@ -1,8 +1,8 @@ # Can't test with embedded server that doesn't support grants -- source include/not_embedded.inc -create database if not exists events_test; -use events_test; +CREATE DATABASE IF NOT EXISTS events_test; +USE events_test; --echo "We use procedure here because its statements won't be logged into the general log" --echo "If we had used normal select that are logged in different ways depending on whether" --echo "the test suite is run in normal mode or with --ps-protocol" @@ -13,18 +13,16 @@ BEGIN END| delimiter ;| --echo "Check General Query Log" -SET GLOBAL event_scheduler=2; -create event log_general on schedule every 1 minute do SELect 'alabala', sleep(1) from dual; -TRUNCATE mysql.general_log; ---echo "1 row, the current statement!" --replace_column 1 USER_HOST -call select_general_log(); +CALL select_general_log(); SET GLOBAL event_scheduler=1; +TRUNCATE mysql.general_log; +CREATE EVENT log_general ON SCHEDULE EVERY 1 MINUTE DO SELECT 'alabala', SLEEP(1) FROM DUAL; --echo "Wait the scheduler to start" ---echo "Should see 3 rows - the 'SELect' is in the middle. The other two are selects from general_log" ---sleep 0.7 +--sleep 1.5 +--echo "Should see 2 rows - the 'SELECT' is in the middle. The other two are selects from general_log" --replace_column 1 USER_HOST -call select_general_log(); +CALL select_general_log(); DROP PROCEDURE select_general_log; DROP EVENT log_general; SET GLOBAL event_scheduler=2; @@ -102,4 +100,4 @@ DROP TABLE slow_event_test; SET GLOBAL long_query_time =@old_global_long_query_time; SET SESSION long_query_time =@old_session_long_query_time; -drop database events_test; +DROP DATABASE events_test; |