diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-12 03:36:45 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-12 03:37:13 +0200 |
commit | 1c5ca7c1837b9db071cb2e791d6605f8806af0c1 (patch) | |
tree | d8f4983bbb554cf6f2c43e1497313be061d471b7 /scripts/mysqld_safe.sh | |
parent | 9a4bc0d098a9fba03e88b80db0f921b5ee597123 (diff) | |
parent | ab93a4d4df7206833fa4a8eb0aa47b8ba185da60 (diff) | |
download | mariadb-git-1c5ca7c1837b9db071cb2e791d6605f8806af0c1.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r-- | scripts/mysqld_safe.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index bbd99e92ced..018530c84cf 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -870,8 +870,13 @@ max_fast_restarts=5 have_sleep=1 # close stdout and stderr, everything goes to $logging now -exec 1>&- -exec 2>&- +if expr "${-}" : '.*x' > /dev/null +then + : +else + exec 1>&- + exec 2>&- +fi while true do |