diff options
| author | unknown <petr@mysql.com> | 2005-07-21 14:21:23 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-07-21 14:21:23 +0400 |
| commit | 34fa3be594434bae844c087f7a79bca5103b758f (patch) | |
| tree | 29261f504adad5b9145e9497ef5c680c3da1d3fe /server-tools/instance-manager/options.h | |
| parent | 15413296d85b31d518255c4ea1cab84618a99f3f (diff) | |
| download | mariadb-git-34fa3be594434bae844c087f7a79bca5103b758f.tar.gz | |
WL #2713 Change IM behaviour so, that it only reads and alters one config file only.
Implemented on brian's request.
server-tools/instance-manager/Makefile.am:
define default config file
server-tools/instance-manager/commands.cc:
Use specified or default file to edit with SET commands instead of hardcoded file
server-tools/instance-manager/commands.h:
add member to SET commands
server-tools/instance-manager/instance_map.cc:
rename first_option -> single_defaults_option, made logging a bit more verbose
server-tools/instance-manager/instance_map.h:
rename first_option -> single_defaults_file + made it public
server-tools/instance-manager/manager.cc:
rename first_option -> single_defaults_file
server-tools/instance-manager/mysqlmanager.cc:
goto generic error label instead of simple return
server-tools/instance-manager/options.cc:
skip --defaults-extra file and give a message if it was specified, made IM
to read one config file only
server-tools/instance-manager/options.h:
added new members to the option structure
Diffstat (limited to 'server-tools/instance-manager/options.h')
| -rw-r--r-- | server-tools/instance-manager/options.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h index 3df259864be..de9a61c2de3 100644 --- a/server-tools/instance-manager/options.h +++ b/server-tools/instance-manager/options.h @@ -36,11 +36,13 @@ 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 *first_option; + 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; + /* argv pointer returned by load_defaults() to be used by free_defaults() */ static char **saved_argv; static int load(int argc, char **argv); |