Commit 6c167919 authored by unknown's avatar unknown
Browse files

Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/mysql-5.0-ndb-bj 

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21585
parents 4b08c9fa 6cdf3c65

ndb/include/util/ndb_opts.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ const char *opt_debug= 0; 
  { "ndb-connectstring", OPT_NDB_CONNECTSTRING, \

    "Set connect string for connecting to ndb_mgmd. " \

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

    "Overides specifying entries in NDB_CONNECTSTRING and Ndb.cfg", \

    "Overrides specifying entries in NDB_CONNECTSTRING and my.cnf", \

    (gptr*) &opt_ndb_connectstring, (gptr*) &opt_ndb_connectstring, \

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

  { "ndb-mgmd-host", OPT_NDB_MGMD, \

ndb/test/ndbapi/flexScan.cpp

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
	 verify delete



       Arguments:

        -f Location of Ndb.cfg file, default Ndb.cfg

        -f Location of my.cnf file, default my.cnf

        -t Number of threads to start, default 1

        -o Number of operations per loop, default 500	-l Number of loops to run, default 1, 0=infinite

        -a Number of attributes, default 25
@@ -829,7 +829,7 @@ static int createTables(Ndb* pMyNdb) 
static void printUsage()

{

  ndbout << "Usage of flexScan:" << endl;

  ndbout << "-f <path> Location of Ndb.cfg file, default: Ndb.cfg" << endl;

  ndbout << "-f <path> Location of my.cnf file, default: my.cnf" << endl;

  ndbout << "-t <int>  Number of threads to start, default 1" << endl;

  ndbout << "-o <int>  Number of operations per loop, default 500" << endl;

  ndbout << "-l <int>  Number of loops to run, default 1, 0=infinite" << endl;

ndb/tools/ndb_config.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static struct my_option my_long_options[] = 
  { "ndb-connectstring", 256,

    "Set connect string for connecting to ndb_mgmd. " 

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

    "Overides specifying entries in NDB_CONNECTSTRING and Ndb.cfg", 

    "Overrides specifying entries in NDB_CONNECTSTRING and my.cnf", 

    (gptr*) &g_connectstring, (gptr*) &g_connectstring, 

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

  { "ndb-shm", 256, "Print nodes",