Commit d374ed9c authored by unknown's avatar unknown
Browse files

added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run

parent d2778647

mysql-test/mysql-test-run.sh

+8 −1
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ USE_EMBEDDED_SERVER="" 
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 @@ while test $# -gt 0; do 
    --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 @@ SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M" 
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

mysql-test/ndb/ndbcluster.sh

+11 −2
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ ndb_con_op=105000 
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 @@ while test $# -gt 0; do 
    --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 @@ if [ ! -x "$exec_waiter" ]; then 
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"