diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:13:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:13:46 +0200 |
| commit | 1933cf98e842f97e11f69afc631638618ec16068 (patch) | |
| tree | 446b8ff1ac09234b99d71ff06b75961c43247083 /mysql-test/t/show_check.test | |
| parent | 137812c88a418479c7d637f4075712d9f6c6c82f (diff) | |
| parent | e8907112790475772b3e5135b58ef95b3fd8ea68 (diff) | |
| download | mariadb-git-bb-10.0-merge.tar.gz | |
Merge 5.5 into 10.0bb-10.0-merge
Diffstat (limited to 'mysql-test/t/show_check.test')
| -rw-r--r-- | mysql-test/t/show_check.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index c43193d1b57..fb1c1b089f2 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -1158,7 +1158,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. |