diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-28 20:05:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-10-14 10:29:30 +0200 |
| commit | 8965ae27b9f011333dd1e2dc47db6e0514b5976a (patch) | |
| tree | 333b593210cb9a29191183bbda67514c08273b07 /include | |
| parent | 5392726e3c4f924745412500a7d1e030226a68d1 (diff) | |
| download | mariadb-git-8965ae27b9f011333dd1e2dc47db6e0514b5976a.tar.gz | |
cleanup: my_defaults, remove Process_option_func
This is a remnant of "MySQL Instance Manager", which was removed in
MySQL-5.5.0 and never existed in MariaDB
Remove callback, simplify and optimize the code accordingly.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_default.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/my_default.h b/include/my_default.h index 865833de34a..fc081c33e7a 100644 --- a/include/my_default.h +++ b/include/my_default.h @@ -26,10 +26,6 @@ extern const char *my_defaults_file; extern my_bool my_getopt_use_args_separator; extern my_bool my_getopt_is_args_separator(const char* arg); -/* Define the type of function to be passed to process_default_option_files */ -typedef int (*Process_option_func)(void *ctx, const char *group_name, - const char *option); - extern int get_defaults_options(int argc, char **argv, char **defaults, char **extra_defaults, char **group_suffix); @@ -37,10 +33,6 @@ extern int my_load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv, const char ***); extern int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); -extern int my_search_option_files(const char *conf_file, int *argc, - char ***argv, uint *args_used, - Process_option_func func, void *func_ctx, - const char **default_directories); extern void free_defaults(char **argv); extern void my_print_default_files(const char *conf_file); extern void print_defaults(const char *conf_file, const char **groups); |