summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-06-11 23:12:48 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-06-12 12:14:14 +0200
commit82f3ceed12063ac400a070b9c1972e139c59f385 (patch)
tree856b7e5f0b2afc73231311b5b84e698f751fa1f7 /sql/sql_class.cc
parent8ec21afc8ed2df3b02815a45624b3287d5ffceae (diff)
downloadmariadb-git-bb-10.5-MDEV-22550.tar.gz
MDEV-16470: switch off user variables (and fixes of its support)bb-10.5-MDEV-22550
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index cee2d644480..23176d5a1db 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1739,7 +1739,9 @@ THD::~THD()
/* trick to make happy memory accounting system */
#ifndef EMBEDDED_LIBRARY
session_tracker.sysvars.deinit();
+#ifdef USER_VAR_TRACKING
session_tracker.user_variables.deinit();
+#endif // USER_VAR_TRACKING
#endif //EMBEDDED_LIBRARY
if (status_var.local_memory_used != 0)