diff options
| author | unknown <andrey@lmy004.> | 2006-01-27 01:07:34 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-27 01:07:34 +0100 |
| commit | 43f6f1b9d5175c6f8d46e9a859219e7c520bf62c (patch) | |
| tree | a9f02481ed02b72873ca0d43315eb8e39ccf14b4 /sql/sql_yacc.yy | |
| parent | 16478e1a7611221b83740bf41f169df11b404aed (diff) | |
| parent | fe1c9f9e045b2f525ec58457b6fdeb144b9e0427 (diff) | |
| download | mariadb-git-43f6f1b9d5175c6f8d46e9a859219e7c520bf62c.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16434
sql/event_timed.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
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 a07bed584d0..c5f4b81fa72 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1476,7 +1476,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; + } + } + } } ; |