bk commit into 5.0 tree (jimw:1.2099)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2099 06/04/26 20:50:27 jimw@stripped +1 -0
  Fix bug in ndbcluster.sh on Solaris (now that line is the same as in 5.1)

  mysql-test/ndb/ndbcluster.sh
    1.46 06/04/26 20:49:39 jimw@stripped +1 -1
    redirect to /dev/null to avoid grep -q

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.45/mysql-test/ndb/ndbcluster.sh	2006-04-26 11:32:50 -07:00
+++ 1.46/mysql-test/ndb/ndbcluster.sh	2006-04-26 20:49:39 -07:00
@@ -237,7 +237,7 @@
 # test if Ndb Cluster starts properly
 
 echo "Waiting for NDB data nodes to start..."
-if ( $exec_waiter ) | grep -q "NDBT_ProgramExit: 0 - OK"; then :; else
+if ( $exec_waiter ) | grep "NDBT_ProgramExit: 0 - OK" > /dev/null 2>&1; then :; else
   echo "Ndbcluster startup failed"
   stop_default_ndbcluster
   exit 1