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

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

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2438/mysql-4.1
This commit is contained in:
unknown
2004-02-03 01:19:04 +04:00
parent 65534b77a1 bfadd733ac
commit 0058d24da4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_insert.cc
View File

@@ -198,7 +198,8 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
if (duplic == DUP_UPDATE && !table->insert_values)
{
/* 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)
goto abort;
}