summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2004-02-03 01:07:43 +0400
committerunknown <vva@eagle.mysql.r18.ru>2004-02-03 01:07:43 +0400
commitb721b9ab14f0e9629d0708af946f8de77cdd1b6a (patch)
tree583acfc41985e86c28cc160f7ef5f9124b8e481d
parente03628c638d5ce90d660b2f58a4620d22857a37d (diff)
downloadmariadb-git-b721b9ab14f0e9629d0708af946f8de77cdd1b6a.tar.gz
changed allocation of st_table::insert_values
from table->mem_root to thd->mem_root (fixed bug #2438 "Runaway memory consumption")
-rw-r--r--sql/sql_insert.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index c2f3e737daf..74de1772555 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -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;
}