diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2023-02-15 16:30:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-02-15 16:30:53 +0100 |
| commit | b45ed284a69cdbffac61bdcf74bf86fa7b7391a4 (patch) | |
| tree | de26ce8e0a5aa40889e889d758e3a3a98b9f71a8 /sql/sql_lex.h | |
| parent | cc182aca9352fb7efde0deb0a83844e1d5f0c64c (diff) | |
| parent | cafba8761af55ae16cc69c9b53a341340a845b36 (diff) | |
| download | mariadb-git-bb-11.0-all-builders.tar.gz | |
Merge branch '10.11' into 11.0bb-11.0-all-builders
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 95ed308103d..9d419ec9a6a 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1204,12 +1204,14 @@ public: group_list_ptrs, and re-establish the original list before each execution. */ SQL_I_List<ORDER> group_list; + SQL_I_List<ORDER> save_group_list; Group_list_ptrs *group_list_ptrs; List<Item> item_list; /* list of fields & expressions */ List<Item> pre_fix; /* above list before fix_fields */ List<Item> fix_after_optimize; SQL_I_List<ORDER> order_list; /* ORDER clause */ + SQL_I_List<ORDER> save_order_list; SQL_I_List<ORDER> gorder_list; Lex_select_limit limit_params; /* LIMIT clause parameters */ @@ -3559,8 +3561,6 @@ public: } - SQL_I_List<ORDER> save_group_list; - SQL_I_List<ORDER> save_order_list; LEX_CSTRING *win_ref; Window_frame *win_frame; Window_frame_bound *frame_top_bound; @@ -4823,8 +4823,8 @@ public: const LEX_CSTRING *constraint_name, Table_ident *ref_table_name, DDL_options ddl_options); + bool check_dependencies_in_with_clauses(); - bool resolve_references_to_cte_in_hanging_cte(); bool check_cte_dependencies_and_resolve_references(); bool resolve_references_to_cte(TABLE_LIST *tables, TABLE_LIST **tables_last); |