summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2015-08-31 12:57:46 +0300
committerMonty <monty@mariadb.org>2015-09-01 18:42:02 +0300
commit56aa19989f5800df8a398173727558bfb3ea1251 (patch)
treef87dbcca91d699cbc2539a344d6dabd6b71c2131 /sql/unireg.cc
parent8ea9b8c0b168b3e5aad08886477d8726531abcd5 (diff)
downloadmariadb-git-56aa19989f5800df8a398173727558bfb3ea1251.tar.gz
MDEV-6152: Remove calls to current_thd while creating Item
Part 5: Removing calls to current_thd in net_read calls, creating fields, query_cache, acl and some other places where thd was available
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 49503794c38..66959f400d9 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -924,7 +924,7 @@ static bool make_empty_rec(THD *thd, uchar *buff, uint table_options,
/*
regfield don't have to be deleted as it's allocated with sql_alloc()
*/
- Field *regfield= make_field(&share,
+ Field *regfield= make_field(&share, thd->mem_root,
buff+field->offset + data_offset,
field->length,
null_pos + null_count / 8,