database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only."

Browse Source
This commit is contained in:
petr@mysql.com
2005-07-21 22:40:53 +04:00
parent b9fcdfbb0f
commit 9644bc3e2b
7 changed files with 29 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server-tools/instance-manager/instance_map.cc
View File

@ -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");