database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-03-31 21:32:41 +02:00
parent e093e5abbe eaebe8b560
commit ac5a534a4c
306 changed files with 10920 additions and 6615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_lex.h
View File

@ -1034,6 +1034,8 @@ public:
bool set_lock_to_the_last_select(Lex_select_lock l);
bool can_be_merged();
friend class st_select_lex;
};
@ -1163,7 +1165,8 @@ public:
st_select_lex.
*/
uint curr_tvc_name;
/* true <=> select has been created a TVC wrapper */
bool is_tvc_wrapper;
/*
Needed to correctly generate 'PRIMARY' or 'SIMPLE' for select_type column
of EXPLAIN
@ -1443,6 +1446,10 @@ public:
}
bool setup_ref_array(THD *thd, uint order_group_num);
void print(THD *thd, String *str, enum_query_type query_type);
void print_item_list(THD *thd, String *str, enum_query_type query_type);
void print_set_clause(THD *thd, String *str, enum_query_type query_type);
void print_on_duplicate_key_clause(THD *thd, String *str,
enum_query_type query_type);
static void print_order(String *str,
ORDER *order,
enum_query_type query_type);
@ -3541,6 +3548,8 @@ public:
Window_frame_bound *frame_bottom_bound;
Window_spec *win_spec;
Item *upd_del_where;
/* System Versioning */
vers_select_conds_t vers_conditions;
vers_select_conds_t period_conditions;