From 35b59e81c52f3e9a2fa9147a33b23cd6bb9afbdd Mon Sep 17 00:00:00 2001 From: David Hall Date: Thu, 9 Apr 2020 10:53:27 -0500 Subject: [PATCH 1/2] MCOL-3934 Delete xml parse trees during shutdown --- dbcon/mysql/ha_mcs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dbcon/mysql/ha_mcs.h b/dbcon/mysql/ha_mcs.h index 8baf31e7e..c76aff81c 100644 --- a/dbcon/mysql/ha_mcs.h +++ b/dbcon/mysql/ha_mcs.h @@ -21,6 +21,7 @@ #include #include "idb_mysql.h" #include "ha_mcs_sysvars.h" +#include "configcpp.h" extern handlerton* mcs_hton; @@ -49,6 +50,7 @@ public: ha_mcs(handlerton* hton, TABLE_SHARE* table_arg); ~ha_mcs() { + config::Config::deleteInstanceMap(); } /** @brief From 225789e171964db98a9484ef89bac2d535f5befb Mon Sep 17 00:00:00 2001 From: David Hall Date: Fri, 10 Apr 2020 13:33:16 -0500 Subject: [PATCH 2/2] MCOL-3934 free memory from XML parse at shutdown --- dbcon/mysql/ha_mcs.cpp | 1 + dbcon/mysql/ha_mcs.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp index 04fd9053a..5c2c3560c 100644 --- a/dbcon/mysql/ha_mcs.cpp +++ b/dbcon/mysql/ha_mcs.cpp @@ -167,6 +167,7 @@ static int columnstore_done_func(void* p) { DBUG_ENTER("columnstore_done_func"); + config::Config::deleteInstanceMap(); my_hash_free(&mcs_open_tables); #ifndef _MSC_VER pthread_mutex_destroy(&mcs_mutex); diff --git a/dbcon/mysql/ha_mcs.h b/dbcon/mysql/ha_mcs.h index c76aff81c..8baf31e7e 100644 --- a/dbcon/mysql/ha_mcs.h +++ b/dbcon/mysql/ha_mcs.h @@ -21,7 +21,6 @@ #include #include "idb_mysql.h" #include "ha_mcs_sysvars.h" -#include "configcpp.h" extern handlerton* mcs_hton; @@ -50,7 +49,6 @@ public: ha_mcs(handlerton* hton, TABLE_SHARE* table_arg); ~ha_mcs() { - config::Config::deleteInstanceMap(); } /** @brief