Commit 735be563 authored by unknown's avatar unknown
Browse files

changed to use the future-proof option to ndb_mgmd 

there was a clash in using -c, added -f as the future proof switch


mysql-test/ndb/ndbcluster.sh:
  changed to use the future-proof option to ndb_mgmd
ndb/src/mgmsrv/main.cpp:
  there was a clash in using -c, added -f as the future proof switch
parent 269c977a

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);