diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 11:42:37 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 11:42:37 +0200 |
| commit | 2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f (patch) | |
| tree | faaec8693d4aa4ba3a71c11a6143fc8d08d1fa95 /sql/sql_class.h | |
| parent | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (diff) | |
| parent | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff) | |
| download | mariadb-git-2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f.tar.gz | |
Merge branch '10.7' into 10.8
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 207bc074bd5..cae0762d2c9 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -121,8 +121,8 @@ enum enum_slave_type_conversions { SLAVE_TYPE_CONVERSIONS_ALL_LOSSY, SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY}; /* - MARK_COLUMNS_READ: A column is goind to be read. - MARK_COLUMNS_WRITE: A column is going to be written to. + COLUMNS_READ: A column is goind to be read. + COLUMNS_WRITE: A column is going to be written to. MARK_COLUMNS_READ: A column is goind to be read. A bit in read set is set to inform handler that the field is to be read. If field list contains duplicates, then @@ -1338,6 +1338,7 @@ public: LEX_CSTRING name; /* name for named prepared statements */ LEX *lex; // parse tree descriptor + my_hrtime_t hr_prepare_time; // time of preparation in microseconds /* Points to the query associated with this statement. It's const, but we need to declare it char * because all table handlers are written @@ -7320,7 +7321,12 @@ public: inline bool add_item_to_list(THD *thd, Item *item) { - bool res= thd->lex->current_select->add_item_to_list(thd, item); + bool res; + LEX *lex= thd->lex; + if (lex->current_select->parsing_place == IN_RETURNING) + res= lex->returning()->add_item_to_list(thd, item); + else + res= lex->current_select->add_item_to_list(thd, item); return res; } |