diff options
| author | unknown <konstantin@bodhi.netgear> | 2006-07-06 22:26:47 +0400 |
|---|---|---|
| committer | unknown <konstantin@bodhi.netgear> | 2006-07-06 22:26:47 +0400 |
| commit | d2b4e9c8e22f3d06848701e8fa1e9c800c471960 (patch) | |
| tree | 267e2c8fc638f0a6236daf41cd0727e22e82d8c2 | |
| parent | b8057c4af0407c3d2466b4975d22fca563a0a9a6 (diff) | |
| parent | 9fecf502a3621d71d3a0d1f5cdfa8836fc8acc40 (diff) | |
| download | mariadb-git-d2b4e9c8e22f3d06848701e8fa1e9c800c471960.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/events_logs_tests.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/events_logs_tests.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/events_logs_tests.result b/mysql-test/r/events_logs_tests.result index 9202d63fd2c..950090399d5 100644 --- a/mysql-test/r/events_logs_tests.result +++ b/mysql-test/r/events_logs_tests.result @@ -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; diff --git a/mysql-test/t/events_logs_tests.test b/mysql-test/t/events_logs_tests.test index 5f4ec852cd3..5c252b1174b 100644 --- a/mysql-test/t/events_logs_tests.test +++ b/mysql-test/t/events_logs_tests.test @@ -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; |