diff options
| author | Monty <monty@mariadb.org> | 2016-02-06 18:14:54 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-02-06 18:14:54 +0200 |
| commit | b2f8d7b41001a5da11b2d99a055a207c3911a213 (patch) | |
| tree | d108ed6d1f38543305235fec6a63228a5a2f08d5 /mysql-test/r/events_2.result | |
| parent | d4b3a199acb0ddcdedff441ae664b0a2cf2fe8d2 (diff) | |
| parent | 07b8aefe90ca830d2de068f2966cd2288b158a88 (diff) | |
| download | mariadb-git-b2f8d7b41001a5da11b2d99a055a207c3911a213.tar.gz | |
Merge branch '10.1' into 10.2
Conflicts:
VERSION
cmake/plugin.cmake
config.h.cmake
configure.cmake
plugin/server_audit/server_audit.c
sql/sql_yacc.yy
Diffstat (limited to 'mysql-test/r/events_2.result')
| -rw-r--r-- | mysql-test/r/events_2.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/events_2.result b/mysql-test/r/events_2.result index 9a1f9d954e8..c57893ccf6f 100644 --- a/mysql-test/r/events_2.result +++ b/mysql-test/r/events_2.result @@ -2,10 +2,10 @@ set sql_mode=""; drop database if exists events_test; create database events_test; use events_test; -create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5; +create event e_26 on schedule at '2027-01-01 00:00:00' disable do set @a = 5; select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event; db name body definer convert_tz(execute_at, 'UTC', 'SYSTEM') on_completion -events_test e_26 set @a = 5 root@localhost 2017-01-01 00:00:00 DROP +events_test e_26 set @a = 5 root@localhost 2027-01-01 00:00:00 DROP drop event e_26; create event e_26 on schedule at NULL disable do set @a = 5; ERROR HY000: Incorrect AT value: 'NULL' |