bk commit into 5.1 tree (jmiller:1.1931)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.1931 05/10/07 19:06:36 jmiller@stripped +1 -0
  mysql-test-run.sh:
    Fixes for cluster testing

  mysql-test/mysql-test-run.sh
    1.284 05/10/07 19:05:31 jmiller@stripped +13 -1
    Fixes for cluster testing

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/mysql5.1

--- 1.283/mysql-test/mysql-test-run.sh	2005-09-16 16:55:53 +02:00
+++ 1.284/mysql-test/mysql-test-run.sh	2005-10-07 19:05:31 +02:00
@@ -703,6 +703,13 @@
    MYSQL_TEST="$VALGRIND_MYSQLTEST $CLIENT_BINDIR/mysqltest"
    MYSQL_CLIENT_TEST="$CLIENT_BINDIR/mysql_client_test"
  fi
+ if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then
+   MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump"
+ elif  [ -f "$BASEDIR/client/mysqldump" ] ; then
+   MYSQL_DUMP="$BASEDIR/client/mysqldump"
+ else
+   MYSQL_DUMP="$BASEDIR/bin/mysqldump"
+ fi
 fi
 
 if [ -z "$MASTER_MYSQLD" ]
@@ -1344,8 +1351,13 @@
     if [ $slave_server_id -eq 2 ] ; then
       savedir=`pwd`
       cd $MYSQL_TEST_DIR
+      if [ "$DO_BENCH" != 1 -a -z "$NDBCLUSTER_EXTRA_OPTS" ]
+       then
+         NDBCLUSTER_EXTRA_OPTS="--small"
+      fi
+
       ./ndb/ndbcluster $NDBCLUSTER_OPTS_SLAVE \
-                     --initial --small --diskless --ndbd-nodes=1 \
+                     --initial $NDBCLUSTER_EXTRA_OPTS --diskless --ndbd-nodes=1 \
                       > /dev/null 2>&1 || NDB_SLAVE_STATUS_OK=0
       cd $savedir
       if [ x$NDB_SLAVE_STATUS_OK != x1 ] ; then