diff options
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 4 | ||||
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 3 | ||||
| -rw-r--r-- | server-tools/instance-manager/user_map.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index ff236b10ad5..4b776fecc83 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -30,9 +30,7 @@ liboptions_a_CPPFLAGS= $(CPPFLAGS) \ -DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \ -DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock" \ -DDEFAULT_PASSWORD_FILE_NAME="$(sysconfdir)/mysqlmanager.passwd" \ - -DDEFAULT_MYSQLD_PATH="$(bindir)/mysqld$(EXEEXT)" \ - -DDEFAULT_USER="root" \ - -DDEFAULT_PASSWORD="" \ + -DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \ -DDEFAULT_MONITORING_INTERVAL="20" \ -DDEFAULT_PORT="2273" \ -DPROTOCOL_VERSION=@PROTOCOL_VERSION@ diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index 31a1eafdd00..e7e17691330 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -225,6 +225,9 @@ int Instance_options::add_option(const char* option) } } + /* if we haven't returned earlier we should just save the option */ + insert_dynamic(&options_array,(gptr) &tmp); + return 0; err: diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc index f145b611a8d..21d66912813 100644 --- a/server-tools/instance-manager/user_map.cc +++ b/server-tools/instance-manager/user_map.cc @@ -129,7 +129,7 @@ int User_map::load(const char *password_file_name) if ((file= my_fopen(password_file_name, O_RDONLY | O_BINARY, MYF(0))) == 0) { /* Probably the password file wasn't specified. Try to leave without it */ - log_info("can't open password file %s: errno=%d, %s", password_file_name, + log_info("[WARNING] can't open password file %s: errno=%d, %s", password_file_name, errno, strerror(errno)); return 0; } |