summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-10-14 10:57:07 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-10-14 10:57:07 -0400
commit308c666b604c7a5018b3b70203bf897c2354d449 (patch)
tree52f4bf4532acfcd20a3264361e788fc44d08d0b5 /scripts
parent04f92dde67a3d4f6fcbdbf65fdb63a54ff6761d8 (diff)
parenteac8d95ffcdea7cd31d60d273e30cb3dfec66add (diff)
downloadmariadb-git-308c666b604c7a5018b3b70203bf897c2354d449.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.5-galera
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 48c766238d4..402e333ce2c 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -711,6 +711,10 @@ else
logging=syslog
fi
+# close stdout and stderr, everything goes to $logging now
+exec 1>&-
+exec 2>&-
+
USER_OPTION=""
if test -w / -o "$USER" = "root"
then
@@ -741,7 +745,7 @@ if [ ! -d $mysql_unix_port_dir ]
then
if ! `mkdir -p $mysql_unix_port_dir`
then
- echo "Fatal error Can't create database directory '$mysql_unix_port'"
+ log_error "Fatal error Can't create database directory '$mysql_unix_port'"
exit 1
fi
chown $user $mysql_unix_port_dir