Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into lmy004.:/work/mysql-5.1-bug16419


mysql-test/r/events.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 9 insertions, 0 deletions

diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test
index 5aa08f582cb..8c0fb371ca7 100644
--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events.test
@@ -33,6 +33,15 @@ select count(*) from t_event3;
 drop event event3;
 drop table t_event3;
 
+
+create event e_26 on schedule at '2017-01-01 00:00:00' disabled do set @a = 5;
+select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;
+drop event e_26;
+--error 1503
+create event e_26 on schedule at NULL disabled do set @a = 5;
+--error 1503
+create event e_26 on schedule at 'definitely not a datetime' disabled do set @a = 5;
+
 set names utf8;
 create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;
 drop event задачка;