Commit eaec73c3 authored by unknown's avatar unknown
Browse files

enabled adding option to ndb_mgm in mysql test run

parent 4c0a0c3e

mysql-test/mysql-test-run.sh

+4 −1
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ USE_EMBEDDED_SERVER="" 
RESULT_EXT=""

TEST_MODE="default"



NDB_MGM_EXTRA_OPTS=

NDB_MGMD_EXTRA_OPTS=

NDBD_EXTRA_OPTS=
@@ -264,6 +265,8 @@ while test $# -gt 0; do 
    --ndb-connectstring=*)

      USE_NDBCLUSTER="--ndbcluster" ;

      USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;;

    --ndb_mgm-extra-opts=*)

      NDB_MGM_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgm-extra-opts=;;"` ;;

    --ndb_mgmd-extra-opts=*)

      NDB_MGMD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgmd-extra-opts=;;"` ;;

    --ndbd-extra-opts=*)
@@ -470,7 +473,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 --ndb_mgmd-extra-opts=\"$NDB_MGMD_EXTRA_OPTS\" --ndbd-extra-opts=\"$NDBD_EXTRA_OPTS\""

NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgm-extra-opts=$NDB_MGM_EXTRA_OPTS --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

+7 −3
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ ndb_con_op=105000 
ndb_dmem=80M

ndb_imem=24M



NDB_MGM_EXTRA_OPTS=

NDB_MGMD_EXTRA_OPTS=

NDBD_EXTRA_OPTS=
@@ -97,6 +98,9 @@ while test $# -gt 0; do 
    --port-base=*)

     port_base=`echo "$1" | sed -e "s;--port-base=;;"`

     ;;

    --ndb_mgm-extra-opts=*)

     NDB_MGM_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgm-extra-opts=;;"`

     ;;

    --ndb_mgmd-extra-opts=*)

     NDB_MGMD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgmd-extra-opts=;;"`

     ;;
@@ -130,7 +134,7 @@ if [ ! -x "$exec_waiter" ]; then 
  exit 1

fi



exec_mgmtclient="$exec_mgmtclient --no-defaults"

exec_mgmtclient="$exec_mgmtclient --no-defaults $NDB_MGM_EXTRA_OPTS"

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"
@@ -178,7 +182,7 @@ fi 


# Edit file system path and ports in config file

if [ $initial_ndb ] ; then

  rm -f $fs_ndb/ndb_*

  rm -f $fs_ndb/ndb_* 2>&1 | cat > /dev/null

  sed \

    -e s,"CHOOSE_MaxNoOfOrderedIndexes","$ndb_no_ord",g \

    -e s,"CHOOSE_MaxNoOfConcurrentOperations","$ndb_con_op",g \