From be1d06c8a5f843e775374e5ec148aaee56970bdc Mon Sep 17 00:00:00 2001
From: Galina Shalygina <galashalygina@gmail.com>
Date: Sun, 8 May 2016 23:04:41 +0300
Subject: Merge branch '10.2' into 10.2-mdev9864

---
 plugin/file_key_management/file_key_management_plugin.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'plugin/file_key_management')

diff --git a/plugin/file_key_management/file_key_management_plugin.cc b/plugin/file_key_management/file_key_management_plugin.cc
index e0afbd68cc9..77344bc57ee 100644
--- a/plugin/file_key_management/file_key_management_plugin.cc
+++ b/plugin/file_key_management/file_key_management_plugin.cc
@@ -169,6 +169,12 @@ static int file_key_management_plugin_init(void *p)
   return parser.parse(&keys);
 }
 
+static int file_key_management_plugin_deinit(void *p)
+{
+  keys.free_memory();
+  return 0;
+}
+
 /*
   Plugin library descriptor
 */
@@ -181,7 +187,7 @@ maria_declare_plugin(file_key_management)
   "File-based key management plugin",
   PLUGIN_LICENSE_GPL,
   file_key_management_plugin_init,
-  NULL,
+  file_key_management_plugin_deinit,
   0x0100 /* 1.0 */,
   NULL,	/* status variables */
   settings,
-- 
cgit v1.2.1