diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 10:16:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 10:16:20 +0200 |
| commit | a5d3c1c819b0c4ba93943f11f592d4379afcdc81 (patch) | |
| tree | a8e7aa820874fea794f9f9cdb7a09f37021923a5 /sql/sql_lex.h | |
| parent | f6cb9e6e2dd0fb2e29a09030e74de7946139e1f4 (diff) | |
| parent | a26e7a37266d8296094dabca52f0f6646fd73926 (diff) | |
| download | mariadb-git-a5d3c1c819b0c4ba93943f11f592d4379afcdc81.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index a1b9d5f2886..c475c6d3385 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1331,6 +1331,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; @@ -4517,13 +4519,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*); @@ -4589,6 +4584,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, |