diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:09:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:27:04 +0200 |
| commit | 349560d5d5e53966fe75eef2bfefd12e29278f6a (patch) | |
| tree | ca1f26f2a2db1c8e2c86b8cbaae00abcebe5f6cf /mysql-test/main/show_check.test | |
| parent | 2d592f757cd624fe964ac39d05b6bdd985a827e2 (diff) | |
| parent | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (diff) | |
| download | mariadb-git-349560d5d5e53966fe75eef2bfefd12e29278f6a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/show_check.test')
| -rw-r--r-- | mysql-test/main/show_check.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/show_check.test b/mysql-test/main/show_check.test index 6e622ffec27..d9025bc8d10 100644 --- a/mysql-test/main/show_check.test +++ b/mysql-test/main/show_check.test @@ -1209,7 +1209,7 @@ CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET NEW.c1 = 'ÔÅÓÔ'; -CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT 'ÔÅÓÔ' AS test; +CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 'ÔÅÓÔ' AS test; # Test: switch the character set and show that SHOW CREATE output is # automatically converted to the new character_set_client. |