diff options
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0043f6495e7..dffc91ea465 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1213,7 +1213,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); Keywords that have different reserved status in std/oracle modes. */ %token <kwd> BODY_SYM /* Oracle-R */ -%token <kwd> COMMENT_SYM %token <kwd> ELSIF_SYM /* Oracle, reserved in PL/SQL*/ %token <kwd> GOTO_SYM /* Oracle, reserved in PL/SQL*/ %token <kwd> OTHERS_SYM /* SQL-2011-N */ @@ -1276,6 +1275,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %token <kwd> COLUMN_GET_SYM %token <kwd> COLUMN_SYM /* SQL-2003-R */ %token <kwd> COLUMN_NAME_SYM /* SQL-2003-N */ +%token <kwd> COMMENT_SYM /* Oracle-R */ %token <kwd> COMMITTED_SYM /* SQL-2003-N */ %token <kwd> COMMIT_SYM /* SQL-2003-R */ %token <kwd> COMPACT_SYM @@ -4729,9 +4729,7 @@ sp_labeled_control: } pop_sp_loop_label // The inner WHILE block { - Lex_spblock tmp; - tmp.curs= MY_TEST($4.m_implicit_cursor); - if (unlikely(Lex->sp_block_finalize(thd, tmp))) // The outer DECLARE..BEGIN..END + if (unlikely(Lex->sp_for_loop_outer_block_finalize(thd, $4))) MYSQL_YYABORT; } | sp_label REPEAT_SYM @@ -4781,12 +4779,10 @@ sp_unlabeled_control: sp_proc_stmts1 END FOR_SYM { - Lex_spblock tmp; - tmp.curs= MY_TEST($3.m_implicit_cursor); if (unlikely(Lex->sp_for_loop_finalize(thd, $3))) MYSQL_YYABORT; Lex->sp_pop_loop_empty_label(thd); // The inner WHILE block - if (unlikely(Lex->sp_block_finalize(thd, tmp))) // The outer DECLARE..BEGIN..END + if (unlikely(Lex->sp_for_loop_outer_block_finalize(thd, $3))) MYSQL_YYABORT; } | REPEAT_SYM |