diff options
author | unknown <andrey@lmy004.> | 2006-01-26 22:01:34 +0100 |
---|---|---|
committer | unknown <andrey@lmy004.> | 2006-01-26 22:01:34 +0100 |
commit | 8b3b76c6d47bdc4b00615196844d789ffdb7a8be (patch) | |
tree | 1ab6a4471772a0de4b7e6c223d93e2beb4b7cd53 /sql/sql_yacc.yy | |
parent | 14c38f001bcaa35075a3d89ee0f0ed748574588c (diff) | |
download | mariadb-git-8b3b76c6d47bdc4b00615196844d789ffdb7a8be.tar.gz |
fix for bug#16434 (Events: Illegal dates don't cause errors)
(post-review commit)
WL#1034 (Internal CRON)
sql/event_timed.cc:
remove bogus check
sql/share/errmsg.txt:
change error messages
sql/sql_yacc.yy:
handle error code returned by event_timed::init_starts()
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index f35683b5f76..678ac9e169c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1467,7 +1467,25 @@ ev_starts: /* empty */ { LEX *lex= Lex; if (!lex->et_compile_phase) - lex->et->init_starts(YYTHD, $2); + { + + switch (lex->et->init_starts(YYTHD, $2)) { + case EVEX_PARSE_ERROR: + yyerror(ER(ER_SYNTAX_ERROR)); + YYABORT; + break; + case EVEX_BAD_PARAMS: + { + char buff[20]; + String str(buff,(uint32) sizeof(buff), system_charset_info); + String *str2= $2->val_str(&str); + my_error(ER_WRONG_VALUE, MYF(0), "STARTS", str2? str2->c_ptr(): + NULL); + YYABORT; + break; + } + } + } } ; |