diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 09:09:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 09:09:31 +0200 |
| commit | 39e2c95771432cf83e98203a220f7eb602f7068b (patch) | |
| tree | 24a449247e4055e4b659af041e32ab7dd467fb5c /sql/sql_lex.h | |
| parent | fcc9f8b10cd2f497ff410b592808eedb3ee5f212 (diff) | |
| parent | 08d8bce583227a25b4f646fa9a836f7893badd9a (diff) | |
| download | mariadb-git-39e2c95771432cf83e98203a220f7eb602f7068b.tar.gz | |
Merge 10.3 into 10.4
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 d3b316d6a8d..6ef36a2a49f 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -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, |