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.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-10-03 16:20:59 +02:00
parent 900d7bf360 7865c8c9a2
commit fe449affcf
7 changed files with 181 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.h
View File

@ -7333,7 +7333,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;
}