diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 10:59:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 10:59:22 +0200 |
| commit | 4da22738765ecc31fe9e253d349ca6e9d0f5d985 (patch) | |
| tree | 3e8530e940109e178ca2085f5f238b890c686646 /sql/sql_yacc.yy | |
| parent | e9572e53e63e8e0b84006d99860c38578dede21f (diff) | |
| parent | fafe60e7e2da72488ff3741367a962b45a23b8ee (diff) | |
| download | mariadb-git-4da22738765ecc31fe9e253d349ca6e9d0f5d985.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8839d7d5c4f..f36e0790795 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 @@ -5338,7 +5338,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: @@ -13969,6 +13974,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: |