diff options
| author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-08 23:04:41 +0300 |
|---|---|---|
| committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-08 23:04:41 +0300 |
| commit | be1d06c8a5f843e775374e5ec148aaee56970bdc (patch) | |
| tree | bd7a95e771ca3b405583dccab8b468dd6fb4509f /plugin/file_key_management | |
| parent | e09b1f2a226bf2763b211f74908a6486b83ebed1 (diff) | |
| download | mariadb-git-be1d06c8a5f843e775374e5ec148aaee56970bdc.tar.gz | |
Merge branch '10.2' into 10.2-mdev9864
Diffstat (limited to 'plugin/file_key_management')
| -rw-r--r-- | plugin/file_key_management/file_key_management_plugin.cc | 8 |
1 files changed, 7 insertions, 1 deletions
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, |