database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

13
server-tools/instance-manager/commands.cc
View File

@ -644,11 +644,6 @@ Set_option::Set_option(Instance_map *instance_map_arg,
if ((instance= instance_map->find(name, len)))
{
instance_name= instance->options.instance_name;
if (instance_map->single_defaults_file_option != NULL)
single_defaults_file=
strchr(instance_map->single_defaults_file_option, '=') + 1;
else
single_defaults_file= NULL;
/* add prefix for add_option */
if ((option_len_arg < MAX_OPTION_LEN - 1) ||
@ -696,12 +691,8 @@ int Set_option::correct_file(int skip)
{
int error;
if (single_defaults_file != NULL)
error= modify_defaults_file(single_defaults_file, option,
option_value, instance_name, skip);
else
error= modify_defaults_file(Options::default_config_file, option,
option_value, instance_name, skip);
error= modify_defaults_file(Options::config_file, option,
option_value, instance_name, skip);
switch (error)
{