diff options
| author | unknown <petr@mysql.com> | 2005-02-18 14:58:30 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-18 14:58:30 +0300 |
| commit | e2d78b85bf004c8c0ec25165d0c9980a3253914a (patch) | |
| tree | e70177c55262e4cf9599d161b38fb2b72ffb2a8b /server-tools/instance-manager/options.h | |
| parent | 31bec292632fb0b77ef20804fea334474e07e326 (diff) | |
| download | mariadb-git-e2d78b85bf004c8c0ec25165d0c9980a3253914a.tar.gz | |
made IM to work with --defaults-file smoothly
BitKeeper/deleted/.del-my.cnf~9322f78f12eb2f3c:
Delete: support-files/my.cnf
include/my_sys.h:
fixed prototype to reflect changes in default.c
mysys/default.c:
use my_search_option_files instead of process_default_option_files. This is used from the IM.
server-tools/instance-manager/instance.cc:
added parameter to complete_initialization(). this ine marks whether we are creating the only instance
(for instance, when no config file given)
server-tools/instance-manager/instance.h:
prototype changed
server-tools/instance-manager/instance_map.cc:
Now call my_search_option_files to work smootly with --defaults-file
server-tools/instance-manager/instance_map.h:
added first_option member. This is set of mysqlmanager was started with --defaults-file or with
--extra-defaults-file to be passed to the my_search_option_files
server-tools/instance-manager/instance_options.cc:
if we have only one instance, name the pidfile `hostname`.pid for compatibility reasons.
server-tools/instance-manager/instance_options.h:
header fixed according to .cc
server-tools/instance-manager/manager.cc:
prototype fixed
server-tools/instance-manager/options.cc:
save --defaults-file of --defaults-extra-file to pass it to my_search_option_files
server-tools/instance-manager/options.h:
added an optin to save --default-file options
support-files/Makefile.am:
revert changes
Diffstat (limited to 'server-tools/instance-manager/options.h')
| -rw-r--r-- | server-tools/instance-manager/options.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h index 1b8570dd7ba..3df259864be 100644 --- a/server-tools/instance-manager/options.h +++ b/server-tools/instance-manager/options.h @@ -35,6 +35,8 @@ struct Options static const char *password_file_name; 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 uint monitoring_interval; static uint port_number; static const char *bind_address; |