diff options
| author | Monty <monty@mariadb.org> | 2016-04-28 11:28:02 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-04-28 16:36:02 +0300 |
| commit | fabeab781920dfcaf8e606708ba2c6812f6ae5d8 (patch) | |
| tree | d3a17702cbc67ed2d31f820e4b2f0988436e86b6 /plugin | |
| parent | dafed5b51591ad85ef7724156f135d5be8fe698d (diff) | |
| download | mariadb-git-fabeab781920dfcaf8e606708ba2c6812f6ae5d8.tar.gz | |
Cleanups
- Avoid some realloc() during startup
- Ensure that file_key_management_plugin frees it's memory early, even if
it's linked statically.
- Fixed compiler warnings from unused variables and missing destructors
- Fixed wrong indentation
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/file_key_management/file_key_management_plugin.cc | 7 |
1 files changed, 6 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..2804393082e 100644 --- a/plugin/file_key_management/file_key_management_plugin.cc +++ b/plugin/file_key_management/file_key_management_plugin.cc @@ -169,6 +169,11 @@ 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(); +} + /* Plugin library descriptor */ @@ -181,7 +186,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, |