diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-04 16:24:41 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-04 16:24:41 +0000 |
| commit | a68b4095ac7267631f866c1382955239d9afa33e (patch) | |
| tree | b5bfb0d90826ffb2a836ae8f9f09c44f76240b93 /mysql-test/ndb | |
| parent | 76211d8689c28fbc49625998b237dacbd9f13408 (diff) | |
| download | mariadb-git-a68b4095ac7267631f866c1382955239d9afa33e.tar.gz | |
to make sure we get the kill right on the different platforms
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 10 |
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 |