Skip to content

M
mariadb
Commit 7419f502 authored by istruewing@chilla.local's avatar istruewing@chilla.local
Browse files
Options

After merge fix.

parent 5d509b32
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
sql/sql_select.cc
View file @ 7419f502
...@@ -13231,14 +13231,15 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param, ...@@ -13231,14 +13231,15 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
tmp= (char*) sql_alloc(field->pack_length()+2); tmp= (char*) sql_alloc(field->pack_length()+2);
if (!tmp) if (!tmp)
goto err; goto err;
if (copy) if (copy)
{ {
copy->set(tmp, item->result_field); copy->set(tmp, item->result_field);
item->result_field->move_field(copy->to_ptr,copy->to_null_ptr,1); item->result_field->move_field(copy->to_ptr,copy->to_null_ptr,1);
#ifdef HAVE_purify #ifdef HAVE_purify
copy->to_ptr[copy->from_length]= 0; copy->to_ptr[copy->from_length]= 0;
#endif #endif
copy++; copy++;
}
} }
} }
else if ((real_pos->type() == Item::FUNC_ITEM || else if ((real_pos->type() == Item::FUNC_ITEM ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7