From e2d78b85bf004c8c0ec25165d0c9980a3253914a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Feb 2005 14:58:30 +0300 Subject: 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 --- server-tools/instance-manager/manager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server-tools/instance-manager/manager.cc') diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc index cf7820d0335..89d49ba9219 100644 --- a/server-tools/instance-manager/manager.cc +++ b/server-tools/instance-manager/manager.cc @@ -67,7 +67,7 @@ void manager(const Options &options) */ User_map user_map; - Instance_map instance_map(options.default_mysqld_path); + Instance_map instance_map(options.default_mysqld_path, options.first_option); Guardian_thread guardian_thread(thread_registry, &instance_map, options.monitoring_interval); -- cgit v1.2.1