diff options
| author | unknown <jimw@mysql.com> | 2006-04-26 11:32:53 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-26 11:32:53 -0700 |
| commit | 7ab5d5a75ee3a8e164a077d6c94122e10b42feaf (patch) | |
| tree | 98df221b33d8e8b78db87ae5d2aeb06ea945858a /mysql-test/ndb/ndbcluster.sh | |
| parent | 130c26a02a4f4f268a56b07f9c5aede1f151c6fa (diff) | |
| parent | 639c9dbc855af79b51d847c24330e6def6556d35 (diff) | |
| download | mariadb-git-7ab5d5a75ee3a8e164a077d6c94122e10b42feaf.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-19083
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/ndb/ndbcluster.sh:
Auto merged
Diffstat (limited to 'mysql-test/ndb/ndbcluster.sh')
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index ad01f6574cf..50eb3987a36 100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh @@ -236,8 +236,8 @@ cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile" # test if Ndb Cluster starts properly -echo "Waiting for started..." -if ( $exec_waiter ) | grep "NDBT_ProgramExit: 0 - OK"; then :; else +echo "Waiting for NDB data nodes to start..." +if ( $exec_waiter ) | grep -q "NDBT_ProgramExit: 0 - OK"; then :; else echo "Ndbcluster startup failed" stop_default_ndbcluster exit 1 |