summaryrefslogtreecommitdiff
path: root/mysql-test/ndb/ndbcluster.sh
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/ndb/ndbcluster.sh')
-rw-r--r--mysql-test/ndb/ndbcluster.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh
index 9894e70c788..9c6b6093b93 100644
--- a/mysql-test/ndb/ndbcluster.sh
+++ b/mysql-test/ndb/ndbcluster.sh
@@ -257,9 +257,13 @@ if [ -f "$fs_ndb/$pidfile" ] ; then
attempt=`expr $attempt + 1`
done
if [ "$kill_pids2" != "" ] ; then
- do_command="kill -9 $kill_pids2"
- echo "Failed to shutdown ndbcluster, executing "$do_command
- $do_command
+ echo "Failed to shutdown ndbcluster, executing kill "$kill_pids2
+ kill -9 -- $kill_pids2 2> /dev/null
+ /bin/kill -9 -- $kill_pids2 2> /dev/null
+ /usr/bin/kill -9 -- $kill_pids2 2> /dev/null
+ kill -9 $kill_pids2 2> /dev/null
+ /bin/kill -9 $kill_pids2 2> /dev/null
+ /usr/bin/kill -9 $kill_pids2 2> /dev/null
fi
rm "$fs_ndb/$pidfile"
fi