summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-10-28 15:50:13 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-10-28 15:50:13 -0400
commit5db2195a35c0a2ee7703ab603721b2f0987d2585 (patch)
tree1306ce565f0f01f56dd31b2c43b1233bcb08257c /scripts
parentc9ded859a6fad25fc513d3a0c7d17f826e567691 (diff)
parenteca8c324e9a02f530853580991b11b587f54b24a (diff)
downloadmariadb-git-5db2195a35c0a2ee7703ab603721b2f0987d2585.tar.gz
Merge tag 'mariadb-10.0.28' into 10.0-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 b8df320bf93..9d8bbce4860 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -717,6 +717,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
@@ -747,7 +751,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