bk commit into 4.1 tree (tomas:1.2143)

[tomas]

Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2143 05/01/19 10:00:41 tomas@stripped +2 -0
  added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run

  mysql-test/ndb/ndbcluster.sh
    1.38 05/01/19 10:00:25 tomas@stripped +11 -2
    added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run

  mysql-test/mysql-test-run.sh
    1.231 05/01/19 10:00:24 tomas@stripped +8 -1
    added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1

--- 1.230/mysql-test/mysql-test-run.sh	2005-01-05 13:09:26 +01:00
+++ 1.231/mysql-test/mysql-test-run.sh	2005-01-19 10:00:24 +01:00
@@ -241,6 +241,9 @@
 RESULT_EXT=""
 TEST_MODE="default"
 
+NDB_MGMD_EXTRA_OPTS=
+NDBD_EXTRA_OPTS=
+
 while test $# -gt 0; do
   case "$1" in
     --embedded-server) USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 ; \
@@ -261,6 +264,10 @@
     --ndb-connectstring=*)
       USE_NDBCLUSTER="--ndbcluster" ;
       USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;;
+    --ndb_mgmd-extra-opts=*)
+      NDB_MGMD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgmd-extra-opts=;;"` ;;
+    --ndbd-extra-opts=*)
+      NDBD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndbd-extra-opts=;;"` ;;
     --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;
     --local-master)
       MASTER_MYPORT=3306;
@@ -460,7 +467,7 @@
 export MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1
 
 NDBCLUSTER_BASE_PORT=`expr $NDBCLUSTER_PORT + 2`
-NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var"
+NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgmd-extra-opts=\"$NDB_MGMD_EXTRA_OPTS\" --ndbd-extra-opts=\"$NDBD_EXTRA_OPTS\""
 
 if [ x$SOURCE_DIST = x1 ] ; then
  MY_BASEDIR=$MYSQL_TEST_DIR

--- 1.37/mysql-test/ndb/ndbcluster.sh	2005-01-11 23:08:02 +01:00
+++ 1.38/mysql-test/ndb/ndbcluster.sh	2005-01-19 10:00:25 +01:00
@@ -58,6 +58,9 @@
 ndb_dmem=80M
 ndb_imem=24M
 
+NDB_MGMD_EXTRA_OPTS=
+NDBD_EXTRA_OPTS=
+
 while test $# -gt 0; do
   case "$1" in
     --test)
@@ -94,6 +97,12 @@
     --port-base=*)
      port_base=`echo "$1" | sed -e "s;--port-base=;;"`
      ;;
+    --ndb_mgmd-extra-opts=*)
+     NDB_MGMD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgmd-extra-opts=;;"`
+     ;;
+    --ndbd-extra-opts=*)
+     NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`
+     ;;
     -- )  shift; break ;;
     --* ) $ECHO "Unrecognized option: $1"; exit 1 ;;
     * ) break ;;
@@ -122,8 +131,8 @@
 fi
 
 exec_mgmtclient="$exec_mgmtclient --no-defaults"
-exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults"
-exec_ndb="$exec_ndb --no-defaults"
+exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS"
+exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS"
 exec_waiter="$exec_waiter --no-defaults"
 
 ndb_host="localhost"