diff options
| author | Mayank Prasad <mayank.prasad@oracle.com> | 2011-03-28 21:08:16 +0530 |
|---|---|---|
| committer | Mayank Prasad <mayank.prasad@oracle.com> | 2011-03-28 21:08:16 +0530 |
| commit | e65b3b86f0e7b43de60ce4472bcc24cec851a51c (patch) | |
| tree | 933a2e38215ded596bb3163a66b32b6dade9d72d /mysql-test | |
| parent | 3936d47f1518061bd8b6583c51ef4f07d0ce761c (diff) | |
| parent | 08e472ff349bb5d21b4881828ed62748ecf7aa40 (diff) | |
| download | mariadb-git-e65b3b86f0e7b43de60ce4472bcc24cec851a51c.tar.gz | |
merge from 5.1 for bug#11751148
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/events_bugs.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/events_bugs.test | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result index 1e89d7f746d..b0ca5daaea2 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/events_bugs.result @@ -747,15 +747,15 @@ event_name originator ev1 4294967295 DROP EVENT ev1; SET GLOBAL server_id = @old_server_id; +CREATE DATABASE event_test12; +USE event_test12; +CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1; CREATE DATABASE event_test1; USE event_test1; -CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1; -CREATE DATABASE event_test2; -USE event_test2; SHOW EVENTS; Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation DROP DATABASE event_test1; -DROP DATABASE event_test2; +DROP DATABASE event_test12; DROP DATABASE events_test; SET GLOBAL event_scheduler= 'ON'; SET @@global.concurrent_insert= @concurrent_insert; diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test index f56823b33b1..9432e64e032 100644 --- a/mysql-test/t/events_bugs.test +++ b/mysql-test/t/events_bugs.test @@ -1225,15 +1225,15 @@ SET GLOBAL server_id = @old_server_id; # Bug#11751148: show events shows events in other schema # +CREATE DATABASE event_test12; +USE event_test12; +CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1; CREATE DATABASE event_test1; USE event_test1; -CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1; -CREATE DATABASE event_test2; -USE event_test2; # Following show events should not show ev1 SHOW EVENTS; DROP DATABASE event_test1; -DROP DATABASE event_test2; +DROP DATABASE event_test12; ########################################################################### |