summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-09-29 12:31:46 +0200
committerSergei Golubchik <serg@mariadb.org>2016-09-29 12:31:46 +0200
commita3f11f75499ffc867aefe24c80a9c57fbdfb8ac2 (patch)
tree3b031b05ba80e851983342aff066c1d1315a3cdb /scripts
parent23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff)
parent7497ebf8a49bfe30bb4110f2ac20a30f804b7946 (diff)
downloadmariadb-git-a3f11f75499ffc867aefe24c80a9c57fbdfb8ac2.tar.gz
Merge branch '5.5' into 10.0
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 49a2b0ed8ed..8585edd5cb2 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -626,6 +626,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
@@ -656,7 +660,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