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 branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-10-04 07:41:35 +02:00
parent 7d4b2b9847 fe449affcf
commit b6ebadaa66
344 changed files with 13374 additions and 5521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_class.h
View File

@ -120,8 +120,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
@ -1336,6 +1336,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
@ -7313,7 +7314,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;
}