diff options
| author | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2011-06-10 01:08:38 +0700 |
|---|---|---|
| committer | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2011-06-10 01:08:38 +0700 |
| commit | 4fe2cd10c2b18c8e0b9af3a5511b7dd23977c7b5 (patch) | |
| tree | 2230c6a2b8bf381000341f9ed1846dd03e058f0f | |
| parent | 1be4de546ea89a05babb94d9a95e3bce2fccf0f0 (diff) | |
| parent | 53e4a8520493a33916c7c8079dcc4c09898ee4e4 (diff) | |
| download | mariadb-git-4fe2cd10c2b18c8e0b9af3a5511b7dd23977c7b5.tar.gz | |
Auto-merge of follow-up for bug#11764334 from mysql-5.1 tree.
| -rw-r--r-- | mysql-test/r/events_bugs.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/events_bugs.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result index 84597eb3c17..a7f0e09e81e 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/events_bugs.result @@ -802,11 +802,11 @@ USE event_test11764334; CREATE EVENT ev1 ON SCHEDULE EVERY 3 SECOND DISABLE DO SELECT 1; SHOW EVENTS IN event_test11764334 WHERE NAME='ev1'; Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -event_test11764334 ev1 root@localhost SYSTEM RECURRING NULL 3 SECOND 2011-06-09 19:59:01 NULL DISABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci +event_test11764334 ev1 root@localhost SYSTEM RECURRING NULL 3 SECOND # # DISABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci ALTER EVENT ev1 ON SCHEDULE EVERY 4 SECOND; SHOW EVENTS IN event_test11764334 WHERE NAME='ev1'; Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -event_test11764334 ev1 root@localhost SYSTEM RECURRING NULL 4 SECOND 2011-06-09 19:59:01 NULL DISABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci +event_test11764334 ev1 root@localhost SYSTEM RECURRING NULL 4 SECOND # # DISABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci DROP EVENT ev1; DROP DATABASE event_test11764334; USE test; diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test index 06dc3b30aa2..3a840aedc7c 100644 --- a/mysql-test/t/events_bugs.test +++ b/mysql-test/t/events_bugs.test @@ -1295,8 +1295,10 @@ DROP DATABASE IF EXISTS event_test11764334; CREATE DATABASE event_test11764334; USE event_test11764334; CREATE EVENT ev1 ON SCHEDULE EVERY 3 SECOND DISABLE DO SELECT 1; +--replace_column 9 # 10 # SHOW EVENTS IN event_test11764334 WHERE NAME='ev1'; ALTER EVENT ev1 ON SCHEDULE EVERY 4 SECOND; +--replace_column 9 # 10 # SHOW EVENTS IN event_test11764334 WHERE NAME='ev1'; DROP EVENT ev1; DROP DATABASE event_test11764334; |