diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2008-11-21 22:28:23 +0100 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2008-11-21 22:28:23 +0100 |
| commit | d082cf340ce870691e4c944c0cc0c85ce65223cc (patch) | |
| tree | 6d4cda5f97304f7cdaa186398bb8205b8c0c8631 /mysql-test/r/events_scheduling.result | |
| parent | 58fddfccddd0857cd7ab15d13d42efc37e8191ef (diff) | |
| download | mariadb-git-d082cf340ce870691e4c944c0cc0c85ce65223cc.tar.gz | |
- Fix for Bug#39854 events_scheduling fails sporadically on pushbuild
- restore original state of event_scheduler at the end of the test
- minor fixes around comments, formatting
Diffstat (limited to 'mysql-test/r/events_scheduling.result')
| -rw-r--r-- | mysql-test/r/events_scheduling.result | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/events_scheduling.result b/mysql-test/r/events_scheduling.result index b7d4578bede..63140bffaa4 100644 --- a/mysql-test/r/events_scheduling.result +++ b/mysql-test/r/events_scheduling.result @@ -1,7 +1,8 @@ CREATE DATABASE IF NOT EXISTS events_test; USE events_test; +SET @event_scheduler=@@global.event_scheduler; SET GLOBAL event_scheduler=OFF; -Try agian to make sure it's allowed +Try again to make sure it's allowed SET GLOBAL event_scheduler=OFF; SHOW VARIABLES LIKE 'event_scheduler'; Variable_name Value @@ -64,8 +65,8 @@ INSERT INTO table_4 VALUES (1); SELECT IF(SUM(a) >= 4, 'OK', 'ERROR') FROM table_1; IF(SUM(a) >= 4, 'OK', 'ERROR') OK -SELECT IF(SUM(a) >= 5, 'OK', 'ERROR') FROM table_2; -IF(SUM(a) >= 5, 'OK', 'ERROR') +SELECT IF(SUM(a) >= 4, 'OK', 'ERROR') FROM table_2; +IF(SUM(a) >= 4, 'OK', 'ERROR') OK SELECT IF(SUM(a) >= 1, 'OK', 'ERROR') FROM table_3; IF(SUM(a) >= 1, 'OK', 'ERROR') @@ -94,4 +95,4 @@ DROP TABLE table_2; DROP TABLE table_3; DROP TABLE table_4; DROP DATABASE events_test; -SET GLOBAL event_scheduler=OFF; +SET GLOBAL event_scheduler=@event_scheduler; |