summaryrefslogtreecommitdiff
path: root/sql/sql_tvc.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 10:45:41 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 10:45:41 +0200
commit3386b309756adba6b9633ad18c4e0575c7304cfe (patch)
tree094ff72f23d15731b16b2606494f69342052b194 /sql/sql_tvc.cc
parent5aa58a0d39e802d8dc0fda2a974713ee69961596 (diff)
parent73ecab3d26c055928673a2629f4513aa7008dbf0 (diff)
downloadmariadb-git-3386b309756adba6b9633ad18c4e0575c7304cfe.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_tvc.cc')
-rw-r--r--sql/sql_tvc.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc
index e7372a13a2d..2a7802f077e 100644
--- a/sql/sql_tvc.cc
+++ b/sql/sql_tvc.cc
@@ -573,7 +573,7 @@ bool Item_func_in::create_value_list_for_tvc(THD *thd,
if (is_list_of_rows)
{
- Item_row *row_list= (Item_row *)(args[i]->build_clone(thd));
+ Item_row *row_list= (Item_row *)(args[i]);
if (!row_list)
return true;
@@ -598,8 +598,7 @@ 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());
}
- Item *arg_clone= args[i]->build_clone(thd);
- if (!arg_clone || tvc_value->push_back(arg_clone))
+ if (tvc_value->push_back(args[i]))
return true;
}