summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2006-03-01 03:50:56 +0100
committerunknown <andrey@lmy004.>2006-03-01 03:50:56 +0100
commitf92ec21f02cbca769900e1a3e76375608e8c5ef7 (patch)
tree807795b0af799fbb8397f6eb9972940924494baf /mysql-test/r
parent401851182950acf4f5e78c3d3f44d2f5d3fc1a1c (diff)
parentb22706e4375d7ec79f1930290b48411638c6e4e9 (diff)
downloadmariadb-git-f92ec21f02cbca769900e1a3e76375608e8c5ef7.tar.gz
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/events_slow_query.result8
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/events_slow_query.result b/mysql-test/r/events_slow_query.result
index 92a8c18300b..90aa629dfc7 100644
--- a/mysql-test/r/events_slow_query.result
+++ b/mysql-test/r/events_slow_query.result
@@ -28,6 +28,9 @@ SELECT * FROM slow_event_test;
slo_val val
SET GLOBAL event_scheduler=1;
"Sleep some more time than the actual event run will take"
+SHOW VARIABLES LIKE 'event_scheduler';
+Variable_name Value
+event_scheduler ON
"Check our table. Should see 1 row"
SELECT * FROM slow_event_test;
slo_val val
@@ -37,7 +40,8 @@ SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;
user_host query_time db sql_text
"This should go to the slow log"
SET SESSION long_query_time=10;
-ALTER EVENT long_event DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(5);
+DROP EVENT long_event;
+CREATE EVENT long_event2 ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(5);
"Sleep some more time than the actual event run will take"
"Check our table. Should see 2 rows"
SELECT * FROM slow_event_test;
@@ -48,7 +52,7 @@ slo_val val
SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;
user_host query_time db sql_text
root[root] @ localhost [localhost] 00:00:05 events_test INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(5)
-DROP EVENT long_event;
+DROP EVENT long_event2;
SET GLOBAL long_query_time =@old_global_long_query_time;
SET SESSION long_query_time =@old_session_long_query_time;
TRUNCATE mysql.slow_log;