Commit ccc9f213 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 0afed4c3 735be563

mysql-test/mysql-test-run.sh

+6 −2
Original line number Diff line number Diff line
@@ -994,9 +994,11 @@ start_master() 
  if [ -n "$1" ] ; then

   id=`$EXPR $1 + 101`;

   this_master_myport=`$EXPR $MASTER_MYPORT + $1`

   NOT_FIRST_MASTER_EXTRA_OPTS="--skip-innodb"

  else

   id=1;

   this_master_myport=$MASTER_MYPORT

   NOT_FIRST_MASTER_EXTRA_OPTS=""

  fi

  if [ -z "$DO_BENCH" ]

  then
@@ -1020,7 +1022,8 @@ start_master() 
	  --open-files-limit=1024 \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \

           $NOT_FIRST_MASTER_EXTRA_OPTS"

  else

    master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \

          --server-id=$id --rpl-recovery-rank=1 \
@@ -1039,7 +1042,8 @@ start_master() 
          --innodb_data_file_path=ibdata1:50M \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \

           $NOT_FIRST_MASTER_EXTRA_OPTS"

  fi



  CUR_MYERR=$MASTER_MYERR

mysql-test/ndb/ndbcluster.sh

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ fi 
rm -f "$cfgfile" 2>&1 | cat > /dev/null

rm -f "$fs_ndb/$cfgfile" 2>&1 | cat > /dev/null



if ( cd "$fs_ndb" ; $exec_mgmtsrvr -c config.ini ) ; then :; else

if ( cd "$fs_ndb" ; $exec_mgmtsrvr -f config.ini ) ; then :; else

  echo "Unable to start $exec_mgmtsrvr from `pwd`"

  exit 1

fi

ndb/src/mgmsrv/main.cpp

+25 −2
Original line number Diff line number Diff line
@@ -101,8 +101,23 @@ static char *opt_connect_str= 0; 


static struct my_option my_long_options[] =

{

  NDB_STD_OPTS("ndb_mgmd"),

  { "config-file", 'c', "Specify cluster configuration file",

#ifndef DBUG_OFF

  { "debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",

    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },

#endif

  { "usage", '?', "Display this help and exit.",

    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },

  { "help", '?', "Display this help and exit.",

    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },

  { "version", 'V', "Output version information and exit.", 0, 0, 0,

    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },

  { "connect-string", 1023,

    "Set connect string for connecting to ndb_mgmd. "

    "<constr>=\"host=<hostname:port>[;nodeid=<id>]\". "

    "Overides specifying entries in NDB_CONNECTSTRING and config file",

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0,

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },

  { "config-file", 'f', "Specify cluster configuration file",

    (gptr*) &glob.config_filename, (gptr*) &glob.config_filename, 0,

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },

  { "daemon", 'd', "Run ndb_mgmd in daemon mode (default)",
@@ -120,6 +135,11 @@ static struct my_option my_long_options[] = 
  { "nodaemon", 258, "Don't run as daemon, but don't read from stdin",

    (gptr*) &glob.non_interactive, (gptr*) &glob.non_interactive, 0,

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

  { "config-file", 'c',

    "-c provided for backwards compatability, will be removed in 5.0."

    " Use -f instead",

    (gptr*) &glob.config_filename, (gptr*) &glob.config_filename, 0,

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },

  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};

static void short_usage_sub(void)
@@ -148,6 +168,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case 'V':

    print_version();

    exit(0);

  case 'c':

    printf("Warning: -c will be removed in 5.0, use -f instead\n");

    break;

  case '?':

    usage();

    exit(0);