diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 12:02:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 12:02:11 +0200 |
| commit | c41c79650aa2ef8eaf3f887b94db8cc7478eadd1 (patch) | |
| tree | 5d05c0591e7deef310800a1952a067ad6ad74777 /sql/sql_yacc.yy | |
| parent | a9eb272f9147b2889b95b3f53353e1c735defaba (diff) | |
| parent | cacea31687c098c0348deb1e433f4baddd817419 (diff) | |
| download | mariadb-git-c41c79650aa2ef8eaf3f887b94db8cc7478eadd1.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, 4 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index dfbc89e411a..d506eb489b3 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13298,6 +13298,8 @@ delete_part2: { Lex->last_table()->vers_conditions= Lex->vers_conditions; Lex->pop_select(); //main select + if (Lex->check_main_unit_semantics()) + MYSQL_YYABORT; } ; @@ -13334,6 +13336,8 @@ single_multi: if ($3) Select->order_list= *($3); Lex->pop_select(); //main select + if (Lex->check_main_unit_semantics()) + MYSQL_YYABORT; } | table_wild_list { |