diff options
author | unknown <petr@mysql.com> | 2005-02-05 10:15:34 +0300 |
---|---|---|
committer | unknown <petr@mysql.com> | 2005-02-05 10:15:34 +0300 |
commit | 87e104e44172ff4ed671d9d7c490d61e010c5fb3 (patch) | |
tree | 41d2130d2f0d28fd7e56e247791396f68c4dd357 /server-tools/instance-manager/user_map.cc | |
parent | ab432d6c05d957eeaf7b311a16f2928614241f03 (diff) | |
download | mariadb-git-87e104e44172ff4ed671d9d7c490d61e010c5fb3.tar.gz |
Fixed setup scripts to use mysqlmanager instead of mysqld_safe
server-tools/instance-manager/Makefile.am:
obsolete defaults removed. Also changed default binary placement. Now mysqlmanager should be installed in
libexecdir (usually /usr/sbin)
server-tools/instance-manager/instance_options.cc:
bug, resulted in skipping non-sepcially recognized mysqld options fixed
server-tools/instance-manager/user_map.cc:
log message made a bit more verbose
support-files/mysql.server.sh:
use mysqlmanager tp start mysqld
support-files/mysql.spec.sh:
mysqlmanager should be placed in /usr/bin
Diffstat (limited to 'server-tools/instance-manager/user_map.cc')
-rw-r--r-- | server-tools/instance-manager/user_map.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |