summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2016-04-15 20:47:45 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2016-08-31 17:17:46 +0200
commitc8948b0d0db4c182a744bc8bdbde7cbccff3d57d (patch)
tree00997abdab43192464c9d5d861d7b659797fd448 /sql/sql_string.h
parente7608a78ef45cc46f4e4d5abbda788ad54e80e71 (diff)
downloadmariadb-git-c8948b0d0db4c182a744bc8bdbde7cbccff3d57d.tar.gz
MDEV-8931: (server part of) session state tracking
System variables tracking
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 10f3c4aee43..feab8070cd2 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -359,7 +359,9 @@ public:
if (ALIGN_SIZE(arg_length+1) < Alloced_length)
{
char *new_ptr;
- if (!(new_ptr=(char*) my_realloc(Ptr,arg_length,MYF(0))))
+ if (!(new_ptr=(char*)
+ my_realloc(Ptr, arg_length,MYF((thread_specific ?
+ MY_THREAD_SPECIFIC : 0)))))
{
Alloced_length = 0;
real_alloc(arg_length);