summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-01-10 14:19:11 +0100
committerSergei Golubchik <serg@mariadb.org>2017-01-10 14:19:11 +0100
commit6ad3dd6054b34afea1f1f13dfd925dc7e73f3b16 (patch)
tree0e6242fa4d3fe14f33853fa4f3742c46ecca6758
parent3e63fde52eb42ff23a9b260ed42b18284628ea42 (diff)
downloadmariadb-git-6ad3dd6054b34afea1f1f13dfd925dc7e73f3b16.tar.gz
mysqld_safe: don't close stdout if set -x
-rw-r--r--scripts/mysqld_safe.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 059263fad51..a93a18c729c 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -864,8 +864,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