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/options.h | |
| 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/options.h')
| -rw-r--r-- | server-tools/instance-manager/options.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h index de9a61c2de3..761d366dfb4 100644 --- a/server-tools/instance-manager/options.h +++ b/server-tools/instance-manager/options.h @@ -36,11 +36,10 @@ struct Options static const char *default_mysqld_path; static const char *user; /* the option which should be passed to process_default_option_files */ - static const char *single_defaults_file_option; static uint monitoring_interval; static uint port_number; static const char *bind_address; - static const char *default_config_file; + static const char *config_file; /* argv pointer returned by load_defaults() to be used by free_defaults() */ static char **saved_argv; |