database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-08 09:09:31 +02:00
parent fcc9f8b10c 08d8bce583
commit 39e2c95771
5 changed files with 305 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_lex.h
View File

@ -1287,6 +1287,8 @@ public:
/* it is for correct printing SELECT options */
thr_lock_type lock_type;
List<List_item> save_many_values;
List<Item> *save_insert_list;
table_value_constr *tvc;
bool in_tvc;
@ -4409,13 +4411,6 @@ public:
return false;
}
void tvc_start()
{
field_list.empty();
many_values.empty();
insert_list= 0;
}
SELECT_LEX_UNIT *alloc_unit();
SELECT_LEX *alloc_select(bool is_select);
SELECT_LEX_UNIT *create_unit(SELECT_LEX*);
@ -4470,6 +4465,8 @@ public:
bool distinct);
SELECT_LEX *parsed_subselect(SELECT_LEX_UNIT *unit);
bool parsed_insert_select(SELECT_LEX *firs_select);
void save_values_list_state();
void restore_values_list_state();
bool parsed_TVC_start();
SELECT_LEX *parsed_TVC_end();
TABLE_LIST *parsed_derived_table(SELECT_LEX_UNIT *unit,