mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user