diff options
| author | unknown <aivanov@mysql.com> | 2005-09-07 23:44:23 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2005-09-07 23:44:23 +0400 |
| commit | cf0b4702f568ca76e78e1ac47e0e37e19f1b00f8 (patch) | |
| tree | 0651888ce0ce8e477c3c24c4ac787e191688f772 /sql/sql_yacc.yy | |
| parent | c0c40c5ffd10ce016593ce15d0b2940c2a805d34 (diff) | |
| parent | d78dc15b20a3b992581dace4c01e50aa9f51c976 (diff) | |
| download | mariadb-git-cf0b4702f568ca76e78e1ac47e0e37e19f1b00f8.tar.gz | |
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/alexi/mysql-5.0
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d8ecf6bcfa4..a39ee7c82aa 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -8163,6 +8163,11 @@ handler: HANDLER_SYM table_ident OPEN_SYM opt_table_alias { LEX *lex= Lex; + if (lex->sphead) + { + my_error(ER_SP_BADSTATEMENT, MYF(0), "HANDLER"); + YYABORT; + } lex->sql_command = SQLCOM_HA_OPEN; if (!lex->current_select->add_table_to_list(lex->thd, $2, $4, 0)) YYABORT; @@ -8170,6 +8175,11 @@ handler: | HANDLER_SYM table_ident_nodb CLOSE_SYM { LEX *lex= Lex; + if (lex->sphead) + { + my_error(ER_SP_BADSTATEMENT, MYF(0), "HANDLER"); + YYABORT; + } lex->sql_command = SQLCOM_HA_CLOSE; if (!lex->current_select->add_table_to_list(lex->thd, $2, 0, 0)) YYABORT; @@ -8177,6 +8187,11 @@ handler: | HANDLER_SYM table_ident_nodb READ_SYM { LEX *lex=Lex; + if (lex->sphead) + { + my_error(ER_SP_BADSTATEMENT, MYF(0), "HANDLER"); + YYABORT; + } lex->sql_command = SQLCOM_HA_READ; lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */ lex->current_select->select_limit= new Item_int((int32) 1); |