Commit a44bb8a6 authored by vva@eagle.mysql.r18.ru's avatar vva@eagle.mysql.r18.ru

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_2438/mysql-4.1
parents e2ffbc1a 9762c5d7
...@@ -198,7 +198,8 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, ...@@ -198,7 +198,8 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
if (duplic == DUP_UPDATE && !table->insert_values) if (duplic == DUP_UPDATE && !table->insert_values)
{ {
/* it should be allocated before Item::fix_fields() */ /* it should be allocated before Item::fix_fields() */
table->insert_values=(byte *)alloc_root(&table->mem_root, table->rec_buff_length); table->insert_values=
(byte *)alloc_root(&thd->mem_root, table->rec_buff_length);
if (!table->insert_values) if (!table->insert_values)
goto abort; goto abort;
} }
......
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