diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-29 12:59:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-29 12:59:51 +0200 |
| commit | 2ede40e67e41f294a32ba3e4797bc6fc4c070217 (patch) | |
| tree | ebc7c92dfe7b4f007abd0b331b407ccc61b19578 /scripts | |
| parent | ad2076945062f7f6d29752641048071229435391 (diff) | |
| parent | a3f11f75499ffc867aefe24c80a9c57fbdfb8ac2 (diff) | |
| download | mariadb-git-2ede40e67e41f294a32ba3e4797bc6fc4c070217.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 07bca1c0318..d4d2a0a6c37 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -738,6 +738,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 @@ -768,7 +772,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 |