database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-01-04 09:26:38 +02:00
parent c410f7aaea 4c3ad24413
commit 3f5726768f
112 changed files with 1741 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_tvc.cc
View File

@@ -571,7 +571,10 @@ bool Item_func_in::create_value_list_for_tvc(THD *thd,
if (is_list_of_rows)
{
Item_row *row_list= (Item_row *)(args[i]);
Item_row *row_list= (Item_row *)(args[i]->build_clone(thd));
if (!row_list)
return true;
for (uint j=0; j < row_list->cols(); j++)
{
@@ -593,7 +596,8 @@ bool Item_func_in::create_value_list_for_tvc(THD *thd,
sprintf(col_name, "_col_%i", 1);
args[i]->set_name(thd, col_name, strlen(col_name), thd->charset());
}
if (tvc_value->push_back(args[i]->real_item()))
Item *arg_clone= args[i]->build_clone(thd);
if (!arg_clone || tvc_value->push_back(arg_clone))
return true;
}