Commit 98c7825a authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/include/util/ndb_opts.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  manual merge
mysql-test/mysql-test-run.sh:
  manual merge
mysql-test/ndb/ndbcluster.sh:
  manual merge
parents f5c2191c 0a22763f

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,7 @@ sub ndbcluster_start ($) { 
  if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",

	       ["--port=$opt_ndbcluster_port",

		"--data-dir=$opt_vardir",

	        "--character-sets-dir=$path_charsetsdir"],

		"--verbose=2",

	        "--core"],

	       "", "/dev/null", "", "") )

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ start_ndbcluster() 
    then

      NDBCLUSTER_EXTRA_OPTS="--small"

    fi

    OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --verbose=$NDB_VERBOSE --initial --relative-config-data-dir --core"

    OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --character-sets-dir=$CHARSETSDIR --verbose=$NDB_VERBOSE --initial --relative-config-data-dir --core"

    if [ "x$NDB_VERBOSE" != "x0" ] ; then

      echo "Starting master ndbcluster " $OPTS

    fi

mysql-test/ndb/ndbcluster.sh

+5 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ VERBOSE=100 
NDB_MGM_EXTRA_OPTS=

NDB_MGMD_EXTRA_OPTS=

NDBD_EXTRA_OPTS=

CHARSETSDIR=



while test $# -gt 0; do

  case "$1" in
@@ -119,6 +120,9 @@ while test $# -gt 0; do 
    --ndbd-extra-opts=*)

     NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`

     ;;

    --character-sets-dir=*)

     CHARSETSDIR=`echo "$1" | sed -e "s;--character-sets-dir=;;"`

     ;;

    --core)

     opt_core="--core"

     ;;
@@ -159,7 +163,7 @@ fi 


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

exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $opt_core $NDB_MGMD_EXTRA_OPTS"

exec_ndb="$exec_ndb --no-defaults $opt_core $NDBD_EXTRA_OPTS"

exec_ndb="$exec_ndb --no-defaults $opt_core $NDBD_EXTRA_OPTS --character-sets-dir=$CHARSETSDIR"

exec_waiter="$exec_waiter --no-defaults $opt_core"



ndb_host="localhost"

storage/ndb/include/util/ndb_opts.h

+5 −1
Original line number Diff line number Diff line
@@ -84,7 +84,10 @@ const char *opt_debug= 0; 
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\

  { "core-file", OPT_WANT_CORE, "Write core on errors.",\

    (gptr*) &opt_core, (gptr*) &opt_core, 0,\

    GET_BOOL, NO_ARG, OPT_WANT_CORE_DEFAULT, 0, 0, 0, 0, 0}

    GET_BOOL, NO_ARG, OPT_WANT_CORE_DEFAULT, 0, 0, 0, 0, 0},\

  {"character-sets-dir", OPT_CHARSETS_DIR,\

     "Directory where character sets are.", (gptr*) &charsets_dir,\

     (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}\



#ifndef DBUG_OFF

#define NDB_STD_OPTS(prog_name) \
@@ -111,6 +114,7 @@ enum ndb_std_options { 
  OPT_WANT_CORE,

  OPT_NDB_MGMD,

  OPT_NDB_NODEID,

  OPT_CHARSETS_DIR,

  NDB_STD_OPTIONS_LAST /* should always be last in this enum */

};