From 6cdf3c65a4d0c2e48de0693f40233eb3e70a8b4c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Sep 2006 20:13:03 +0800 Subject: [PATCH] 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". --- ndb/include/util/ndb_opts.h | 2 +- ndb/test/ndbapi/flexScan.cpp | 4 ++-- ndb/tools/ndb_config.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ndb/include/util/ndb_opts.h b/ndb/include/util/ndb_opts.h index 08ab4a2e9df..053cc8613f7 100644 --- a/ndb/include/util/ndb_opts.h +++ b/ndb/include/util/ndb_opts.h @@ -58,7 +58,7 @@ const char *opt_debug= 0; { "ndb-connectstring", OPT_NDB_CONNECTSTRING, \ "Set connect string for connecting to ndb_mgmd. " \ "Syntax: \"[nodeid=;][host=][:]\". " \ - "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, \ diff --git a/ndb/test/ndbapi/flexScan.cpp b/ndb/test/ndbapi/flexScan.cpp index 4d2c85d6955..1f001bd0210 100644 --- a/ndb/test/ndbapi/flexScan.cpp +++ b/ndb/test/ndbapi/flexScan.cpp @@ -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 Location of Ndb.cfg file, default: Ndb.cfg" << endl; + ndbout << "-f Location of my.cnf file, default: my.cnf" << endl; ndbout << "-t Number of threads to start, default 1" << endl; ndbout << "-o Number of operations per loop, default 500" << endl; ndbout << "-l Number of loops to run, default 1, 0=infinite" << endl; diff --git a/ndb/tools/ndb_config.cpp b/ndb/tools/ndb_config.cpp index 27ab6a182bb..b59c1731659 100644 --- a/ndb/tools/ndb_config.cpp +++ b/ndb/tools/ndb_config.cpp @@ -67,7 +67,7 @@ static struct my_option my_long_options[] = { "ndb-connectstring", 256, "Set connect string for connecting to ndb_mgmd. " "Syntax: \"[nodeid=;][host=][:]\". " - "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",