diff options
| author | unknown <magnus@neptunus.(none)> | 2004-04-30 13:41:19 +0200 |
|---|---|---|
| committer | unknown <magnus@neptunus.(none)> | 2004-04-30 13:41:19 +0200 |
| commit | ddbef950cb9b5373ac5e04547f7fac20bde26398 (patch) | |
| tree | 97220179cc51defd202848b57a6ca58131b22bd4 /mysql-test/ndb | |
| parent | 74a46d1359d1b56abaa8a222968c4d2920d84af6 (diff) | |
| parent | 4960b897b7b5c8a00d275f2af159455f218e38f4 (diff) | |
| download | mariadb-git-ddbef950cb9b5373ac5e04547f7fac20bde26398.tar.gz | |
Merge neptunus.(none):/home/magnus/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1-sql-bench
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
Diffstat (limited to 'mysql-test/ndb')
| -rwxr-xr-x | mysql-test/ndb/stop_ndbcluster | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/ndb/stop_ndbcluster b/mysql-test/ndb/stop_ndbcluster index 09e22cf69c4..e1a98f1de07 100755 --- a/mysql-test/ndb/stop_ndbcluster +++ b/mysql-test/ndb/stop_ndbcluster @@ -22,9 +22,9 @@ done stop_default_ndbcluster() { -if [ ! -f $pidfile ] ; then - exit 0 -fi +#if [ ! -f $pidfile ] ; then +# exit 0 +#fi if [ ! -f $cfgfile ] ; then echo "$cfgfile missing" @@ -43,8 +43,11 @@ echo "all stop" | $exec_mgmtclient sleep 5 -kill `cat $pidfile` -rm $pidfile +if [ -f $pidfile ] ; then + kill `cat $pidfile` + rm $pidfile +fi + } stop_default_ndbcluster |