summaryrefslogtreecommitdiff
path: root/scripts/mysqld_safe.sh
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-11-12 17:48:01 +0200
committerunknown <monty@mysql.com>2004-11-12 17:48:01 +0200
commit4e561d743fdb3a822b2dbb1b9911f76ff3dd6775 (patch)
tree2661295030ea874fb71b238eedd8548c4434b8e5 /scripts/mysqld_safe.sh
parent5cc4a6e928ebb3026c45745bbc1c4cd0d18194b0 (diff)
parent55ae2e788088067fe539020c5162f4cfd96dfe43 (diff)
downloadmariadb-git-4e561d743fdb3a822b2dbb1b9911f76ff3dd6775.tar.gz
Merge on pull
sql/mysqld.cc: Auto merged
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r--scripts/mysqld_safe.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index b9e7ce21f79..da7e06f6c05 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -315,7 +315,7 @@ do
break
fi
- if test @IS_LINUX@ -a $KILL_MYSQLD -eq 1
+ if @IS_LINUX@ && test $KILL_MYSQLD -eq 1
then
# Test if one process was hanging.
# This is only a fix for Linux (running as base 3 mysqld processes)