summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>2007-10-04 10:55:08 -0700
committerunknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>2007-10-04 10:55:08 -0700
commit1c94c8e674735337af6170cc21db3f685fe4e321 (patch)
treed62a7dda2fcb26f6bd04fe1653abe226e24daa01 /include
parentc0850719bc7d02985c98b3ecf6c0ec0b0acecacf (diff)
downloadmariadb-git-1c94c8e674735337af6170cc21db3f685fe4e321.tar.gz
Bug#31382
"Disabled plugin is provoking Valgrind error" If there are any auto-alloced string plug-in options, memory is allocated during the call for handle_options(). We must free this memory if we are not installing the plug-in. include/my_getopt.h: bug31382 new function: my_cleanup_options() mysys/my_getopt.c: bug31382 new function: my_cleanup_options(), fini_one_value() alter init_variables() to take an extra option. forward declare init_one_value() and fini_one_value() sql/sql_plugin.cc: bug31382 after calling handle_options(), make sure to call my_cleanup_options() if we are not installing the plug-in.
Diffstat (limited to 'include')
-rw-r--r--include/my_getopt.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h
index c74f3ed672e..30c2eb9531a 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -68,6 +68,7 @@ extern my_error_reporter my_getopt_error_reporter;
extern int handle_options (int *argc, char ***argv,
const struct my_option *longopts, my_get_one_option);
+extern void my_cleanup_options(const struct my_option *options);
extern void my_print_help(const struct my_option *options);
extern void my_print_variables(const struct my_option *options);
extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, uint,