diff options
Diffstat (limited to 'server-tools/instance-manager/instance_map.cc')
| -rw-r--r-- | server-tools/instance-manager/instance_map.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/server-tools/instance-manager/instance_map.cc b/server-tools/instance-manager/instance_map.cc index cee8ba5a92d..7356d79e27a 100644 --- a/server-tools/instance-manager/instance_map.cc +++ b/server-tools/instance-manager/instance_map.cc @@ -113,10 +113,8 @@ err_new_instance: C_MODE_END -Instance_map::Instance_map(const char *default_mysqld_path_arg, - const char *single_defaults_file_option_arg): -mysqld_path(default_mysqld_path_arg), -single_defaults_file_option(single_defaults_file_option_arg) +Instance_map::Instance_map(const char *default_mysqld_path_arg): +mysqld_path(default_mysqld_path_arg) { pthread_mutex_init(&LOCK_instance_map, 0); } @@ -240,20 +238,13 @@ int Instance_map::load() /* the name of the program may be orbitrary here in fact */ argv_options[0]= "mysqlmanager"; - if (single_defaults_file_option != NULL) - { - argc= 2; - argv_options[1]= single_defaults_file_option; - argv_options[2]= '\0'; - } - else - argv_options[1]= '\0'; + argv_options[1]= '\0'; /* If the routine failed, we'll simply fallback to defaults in complete_initialization(). */ - if (my_search_option_files(Options::default_config_file, &argc, + if (my_search_option_files(Options::config_file, &argc, (char ***) &argv, &args_used, process_option, (void*) this)) log_info("Falling back to compiled-in defaults"); |