diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:16:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:16:20 +0200 |
| commit | d4cb1776030b643895da0532b75c051f55e84356 (patch) | |
| tree | 67ca086a5e0e0f0b959c8dd2080009bd51dc6a9b /sql/sql_yacc.yy | |
| parent | ca2695392411adc7f1d19f85d464213128e4f285 (diff) | |
| parent | 4da22738765ecc31fe9e253d349ca6e9d0f5d985 (diff) | |
| download | mariadb-git-d4cb1776030b643895da0532b75c051f55e84356.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d914c65658d..eae83f3ee18 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2010, 2020, MariaDB + Copyright (c) 2010, 2021, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4643,7 +4643,12 @@ create_like: opt_create_select: /* empty */ {} - | opt_duplicate opt_as create_select_query_expression opt_versioning_option + | opt_duplicate opt_as create_select_query_expression + opt_versioning_option + { + if (Lex->check_cte_dependencies_and_resolve_references()) + MYSQL_YYABORT; + } ; create_select_query_expression: @@ -13229,7 +13234,10 @@ delete: lex->first_select_lex()->order_list.empty(); } delete_part2 - { } + { + if (Lex->check_cte_dependencies_and_resolve_references()) + MYSQL_YYABORT; + } ; opt_delete_system_time: |