diff options
| author | unknown <kostja@vajra.(none)> | 2007-04-05 20:47:22 +0400 |
|---|---|---|
| committer | unknown <kostja@vajra.(none)> | 2007-04-05 20:47:22 +0400 |
| commit | ff452d050a78083b878260f8d2393016503ae0cb (patch) | |
| tree | 8ca3fb500b914b5ecd4542a6d38a8a4c49bd22c1 /mysql-test/r/events_scheduling.result | |
| parent | a36054f4201568fac1717b451040ffa7925900a2 (diff) | |
| download | mariadb-git-ff452d050a78083b878260f8d2393016503ae0cb.tar.gz | |
Post-merge and post-review fixes for the patch for
Bug#23631 "Events: SHOW VARIABLES doesn't work when mysql.event
is damaged:
mysql-test/r/events.result:
Update results (a post-merge fix)
mysql-test/r/events_bugs.result:
Update results (a post-merge fix)
mysql-test/r/events_scheduling.result:
Update results (a post-merge fix)
mysql-test/t/events_scheduling.test:
Make sure this test has no races.
sql/event_data_objects.cc:
Manual post-merge fix for the events replication patch.
sql/event_data_objects.h:
A post-merge fix.
sql/event_db_repository.cc:
A post-merge fix.
sql/event_scheduler.cc:
We should drop the event inside ::execute since there we have
the right credentials to do so (otherwise Events::drop_event
returns "access denied" error).
sql/events.cc:
A post-review fix for: rename start_or_stop_event_scheduler
to switch_event_scheduler_state.
sql/events.h:
A post-review fix for: rename start_or_stop_event_scheduler
to switch_event_scheduler_state.
sql/set_var.cc:
A post-review fix for: rename start_or_stop_event_scheduler
to switch_event_scheduler_state.
sql/sql_yacc.yy:
Remove unused declaratoins.
Diffstat (limited to 'mysql-test/r/events_scheduling.result')
| -rw-r--r-- | mysql-test/r/events_scheduling.result | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/mysql-test/r/events_scheduling.result b/mysql-test/r/events_scheduling.result index 33c0781d4e7..d45bffcd7ff 100644 --- a/mysql-test/r/events_scheduling.result +++ b/mysql-test/r/events_scheduling.result @@ -44,44 +44,56 @@ CREATE TABLE table_1(a int); CREATE TABLE table_2(a int); CREATE TABLE table_3(a int); CREATE TABLE table_4(a int); -CREATE TABLE T19170(s1 TIMESTAMP); SET GLOBAL event_scheduler=ON; -CREATE EVENT two_sec ON SCHEDULE EVERY 2 SECOND DO INSERT INTO table_1 VALUES(1); -CREATE EVENT start_n_end -ON SCHEDULE EVERY 1 SECOND +CREATE EVENT event_1 ON SCHEDULE EVERY 2 SECOND +DO +INSERT INTO table_1 VALUES (1); +CREATE EVENT event_2 ON SCHEDULE EVERY 1 SECOND ENDS NOW() + INTERVAL 6 SECOND ON COMPLETION PRESERVE -DO INSERT INTO table_2 VALUES(1); -CREATE EVENT only_one_time ON SCHEDULE EVERY 2 SECOND ENDS NOW() + INTERVAL 1 SECOND DO INSERT INTO table_3 VALUES(1); -CREATE EVENT two_time ON SCHEDULE EVERY 1 SECOND ENDS NOW() + INTERVAL 1 SECOND ON COMPLETION PRESERVE DO INSERT INTO table_4 VALUES(1); +DO +INSERT INTO table_2 VALUES (1); +CREATE EVENT event_3 ON SCHEDULE EVERY 2 SECOND ENDS NOW() + INTERVAL 1 SECOND +ON COMPLETION NOT PRESERVE +DO +INSERT INTO table_3 VALUES (1); +CREATE EVENT event_4 ON SCHEDULE EVERY 1 SECOND ENDS NOW() + INTERVAL 1 SECOND +ON COMPLETION PRESERVE +DO +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') OK -SELECT IF(SUM(a) > 0, 'OK', 'ERROR') FROM table_3; -IF(SUM(a) > 0, 'OK', 'ERROR') +SELECT IF(SUM(a) >= 1, 'OK', 'ERROR') FROM table_3; +IF(SUM(a) >= 1, 'OK', 'ERROR') OK -SELECT IF(SUM(a) > 0, 'OK', 'ERROR') FROM table_4; -IF(SUM(a) > 0, 'OK', 'ERROR') +SELECT IF(SUM(a) >= 1, 'OK', 'ERROR') FROM table_4; +IF(SUM(a) >= 1, 'OK', 'ERROR') OK -DROP EVENT two_sec; -SELECT IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL; +SELECT IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR') +FROM INFORMATION_SCHEMA.EVENTS +WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2'; IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR') OK -SELECT IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL; +SELECT IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR') +FROM INFORMATION_SCHEMA.EVENTS +WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2'; IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR') OK -DROP EVENT IF EXISTS events_test.start_n_end; "Already dropped because ended. Therefore an error." -DROP EVENT only_one_time; -ERROR HY000: Unknown event 'only_one_time' +DROP EVENT event_3; +ERROR HY000: Unknown event 'event_3' +DROP EVENT event_1; "Should be preserved" SELECT EVENT_NAME, STATUS FROM INFORMATION_SCHEMA.EVENTS ORDER BY EVENT_NAME; EVENT_NAME STATUS -two_time DISABLED -DROP EVENT two_time; +event_2 DISABLED +event_4 DISABLED +DROP EVENT event_2; +DROP EVENT event_4; DROP TABLE table_1; DROP TABLE table_2; DROP TABLE table_3; |