Commit d2b4e9c8 authored by unknown's avatar unknown
Browse files

Merge bodhi.netgear:/opt/local/work/mysql-5.1-root 

into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
parents b8057c4a 9fecf502

mysql-test/r/events_logs_tests.result

+1 −1
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ USER_HOST SLEEPVAL events_test SELECT SLEEP(2) 
SET SESSION long_query_time=300;

"Make it quite long"

TRUNCATE mysql.slow_log;

SET SESSION long_query_time=1;

CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);

SET SESSION long_query_time=1;

"This won't go to the slow log"

CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(3);

SELECT * FROM slow_event_test;

mysql-test/t/events_logs_tests.test

+1 −1
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ SELECT user_host, query_time, db, sql_text FROM mysql.slow_log; 
SET SESSION long_query_time=300;

--echo "Make it quite long"

TRUNCATE mysql.slow_log;

SET SESSION long_query_time=1;

CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);

SET SESSION long_query_time=1;

--echo "This won't go to the slow log"

CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(3);

SELECT * FROM slow_event_test;