diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-08 12:58:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-08 12:58:11 +0300 |
| commit | d3681335b18b82cf1cfb090ce1938de2ee6b21fc (patch) | |
| tree | 4af0c9cc3024248ad08967bf8922a13cabb794ac /sql/sql_yacc.yy | |
| parent | 996431fdac468a01219feff5aa0062df9d480ace (diff) | |
| parent | 57022dfb25b931a329905364d7056ac61950d300 (diff) | |
| download | mariadb-git-d3681335b18b82cf1cfb090ce1938de2ee6b21fc.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index da752c0a3cb..d8ad3aef7c3 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -19070,7 +19070,7 @@ sp_labeled_block: { Lex->sp_block_init(thd, &$1); } - sp_decl_body_list + opt_sp_decl_body_list { if (unlikely(Lex->sp_block_with_exceptions_finalize_declarations(thd))) MYSQL_YYABORT; @@ -19112,7 +19112,7 @@ sp_unlabeled_block: MYSQL_YYABORT; Lex->sp_block_init(thd); } - sp_decl_body_list + opt_sp_decl_body_list { if (unlikely(Lex->sp_block_with_exceptions_finalize_declarations(thd))) MYSQL_YYABORT; |