database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-20052 Add a MEM_ROOT pointer argument to Type_handler::make_xxx_field()

Browse Source
This commit is contained in:
Alexander Barkov
2019-07-12 06:58:51 +04:00
parent 1517087b54
commit e6ff3f9d1c
17 changed files with 496 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_insert.cc
View File

@ -4127,11 +4127,11 @@ void select_insert::abort_result_set() {
CREATE TABLE (SELECT) ...
***************************************************************************/
Field *Item::create_field_for_create_select(TABLE *table)
Field *Item::create_field_for_create_select(MEM_ROOT *root, TABLE *table)
{
static Tmp_field_param param(false, false, false, false);
Tmp_field_src src;
return create_tmp_field_ex(table, &src, &param);
return create_tmp_field_ex(root, table, &src, &param);
}
@ -4202,7 +4202,8 @@ TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items,
while ((item=it++))
{
Field *tmp_field= item->create_field_for_create_select(&tmp_table);
Field *tmp_field= item->create_field_for_create_select(thd->mem_root,
&tmp_table);
if (!tmp_field)
DBUG_RETURN(NULL);