diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-03 01:52:57 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-03 01:52:57 +0100 |
| commit | b51777484f53b30bf49e921cbc74d39916d530cb (patch) | |
| tree | 4c9faaf0a5cffc8b04abfd8c697396fa72259b5f /sql/sql_yacc.yy | |
| parent | 2377eed362f9b9b3c4a360d75f112ac2ac627539 (diff) | |
| parent | d87301d7d96ab39dc53d072904aab084876f1607 (diff) | |
| download | mariadb-git-b51777484f53b30bf49e921cbc74d39916d530cb.tar.gz | |
merge
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 12e124230e5..86bef83cf1a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9082,8 +9082,7 @@ procedure_clause: MYSQL_YYABORT; } - if (&lex->select_lex != lex->current_select || - lex->select_lex.get_table_list()->derived) + if (&lex->select_lex != lex->current_select) { my_error(ER_WRONG_USAGE, MYF(0), "PROCEDURE", "subquery"); MYSQL_YYABORT; @@ -10724,7 +10723,7 @@ param_marker: my_error(ER_VIEW_SELECT_VARIABLE, MYF(0)); MYSQL_YYABORT; } - item= new (thd->mem_root) Item_param((uint) (lip->get_tok_start() - thd->query)); + item= new (thd->mem_root) Item_param((uint) (lip->get_tok_start() - thd->query())); if (!($$= item) || lex->param_list.push_back(item)) { my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0)); |