diff options
| author | unknown <joreland@mysql.com> | 2005-01-12 11:24:46 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-12 11:24:46 +0100 |
| commit | 40649e92f77b75a41fb3097bc4813c80783ba3a8 (patch) | |
| tree | 1f0b9b0d34e656749bbdb72b8f4306485974c23d /mysql-test/ndb | |
| parent | dd3cfa8d887bab5d7555a7ca9d1b072897b79dcd (diff) | |
| parent | ed6c9afd6d81789fba09e2aa017e1c02968bdf18 (diff) | |
| download | mariadb-git-40649e92f77b75a41fb3097bc4813c80783ba3a8.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
libmysql_r/Makefile.am:
Auto merged
mysql-test/r/analyse.result:
Auto merged
sql/sql_analyse.cc:
Auto merged
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index 848223a091c..2d529f8fe0f 100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh @@ -191,7 +191,7 @@ if ( cd "$fs_ndb" ; $exec_mgmtsrvr -f config.ini ) ; then :; else echo "Unable to start $exec_mgmtsrvr from `pwd`" exit 1 fi -if sleep_until_file_created $fs_ndb/ndb_3.pid 30 +if sleep_until_file_created $fs_ndb/ndb_3.pid 120 then :; else exit 1 fi @@ -201,7 +201,7 @@ cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile" echo "Starting ndbd" ( cd "$fs_ndb" ; $exec_ndb $flags_ndb & ) -if sleep_until_file_created $fs_ndb/ndb_1.pid 30 +if sleep_until_file_created $fs_ndb/ndb_1.pid 120 then :; else stop_default_ndbcluster exit 1 @@ -212,7 +212,7 @@ cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile" echo "Starting ndbd" ( cd "$fs_ndb" ; $exec_ndb $flags_ndb & ) -if sleep_until_file_created $fs_ndb/ndb_2.pid 30 +if sleep_until_file_created $fs_ndb/ndb_2.pid 120 then :; else stop_default_ndbcluster exit 1 |