mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
BUG#21585 The --help option shows a screen of command options for ndbd, ndb_mgmd, ndb_mgm
and other commands related to ndb. For all of these, the help screen contains "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete. ndb/include/util/ndb_opts.h: Change help info from "Ndb.cfg" string to "my.cnf" string in the header file. ndb/test/ndbapi/flexScan.cpp: Change help info from including "Ndb.cfg" to "my.cnf". ndb/tools/ndb_config.cpp: Change help info from including "Ndb.cfg" to "my.cnf".
This commit is contained in:
@ -58,7 +58,7 @@ const char *opt_debug= 0;
|
|||||||
{ "ndb-connectstring", OPT_NDB_CONNECTSTRING, \
|
{ "ndb-connectstring", OPT_NDB_CONNECTSTRING, \
|
||||||
"Set connect string for connecting to ndb_mgmd. " \
|
"Set connect string for connecting to ndb_mgmd. " \
|
||||||
"Syntax: \"[nodeid=<id>;][host=]<hostname>[:<port>]\". " \
|
"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, \
|
(gptr*) &opt_ndb_connectstring, (gptr*) &opt_ndb_connectstring, \
|
||||||
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\
|
||||||
{ "ndb-mgmd-host", OPT_NDB_MGMD, \
|
{ "ndb-mgmd-host", OPT_NDB_MGMD, \
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
verify delete
|
verify delete
|
||||||
|
|
||||||
Arguments:
|
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
|
-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
|
-o Number of operations per loop, default 500 -l Number of loops to run, default 1, 0=infinite
|
||||||
-a Number of attributes, default 25
|
-a Number of attributes, default 25
|
||||||
@ -829,7 +829,7 @@ static int createTables(Ndb* pMyNdb)
|
|||||||
static void printUsage()
|
static void printUsage()
|
||||||
{
|
{
|
||||||
ndbout << "Usage of flexScan:" << endl;
|
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 << "-t <int> Number of threads to start, default 1" << endl;
|
||||||
ndbout << "-o <int> Number of operations per loop, default 500" << 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;
|
ndbout << "-l <int> Number of loops to run, default 1, 0=infinite" << endl;
|
||||||
|
@ -67,7 +67,7 @@ static struct my_option my_long_options[] =
|
|||||||
{ "ndb-connectstring", 256,
|
{ "ndb-connectstring", 256,
|
||||||
"Set connect string for connecting to ndb_mgmd. "
|
"Set connect string for connecting to ndb_mgmd. "
|
||||||
"Syntax: \"[nodeid=<id>;][host=]<hostname>[:<port>]\". "
|
"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,
|
(gptr*) &g_connectstring, (gptr*) &g_connectstring,
|
||||||
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
||||||
{ "ndb-shm", 256, "Print nodes",
|
{ "ndb-shm", 256, "Print nodes",
|
||||||
|
Reference in New Issue
Block a user