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

After merge fix.

Browse Source
This commit is contained in:
istruewing@chilla.local
2006-09-19 14:26:18 +02:00
parent 5d509b32d4
commit 7419f50245
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_select.cc
View File

@ -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 ||