diff options
| author | unknown <petr@mysql.com> | 2005-07-21 22:40:53 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-07-21 22:40:53 +0400 |
| commit | a38f5cd5cde6c90d64fd53646124965dd2d59777 (patch) | |
| tree | 8e766ff2dc502bb300c5dbdeea3bcf2b4dff1ca9 /server-tools/instance-manager/commands.cc | |
| parent | 34fa3be594434bae844c087f7a79bca5103b758f (diff) | |
| download | mariadb-git-a38f5cd5cde6c90d64fd53646124965dd2d59777.tar.gz | |
Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only."
server-tools/instance-manager/commands.cc:
get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/commands.h:
get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/instance_map.cc:
get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/instance_map.h:
get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/manager.cc:
get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/options.cc:
Disable --defaults-extra-file and --no-defaults options for the IM as they have no sence.
Don't use print_defaults as it prints out wrong "first option" information for IM. Use only
Options::config_file to process options
server-tools/instance-manager/options.h:
get rid of single_defaults_file_option and use Options::config_file instead
Diffstat (limited to 'server-tools/instance-manager/commands.cc')
| -rw-r--r-- | server-tools/instance-manager/commands.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index 885233ca13c..ad9d46be1ed 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -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) { |