bk commit into 4.1 tree (gni:1.2535) BUG#21585

[gni]

Below is the list of changes that have just been committed into a local
4.1 repository of root. When root does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-19 11:15:50+08:00, gni@dev3-127.(none) +3 -0
  BUG#21585  The --help option shows a screen of command options for the 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@stripped, 2006-09-19 11:15:48+08:00, gni@dev3-127.(none) +1 -1
    Change help info from Ndb.cfg to my.cnf in the header file.

  ndb/test/ndbapi/flexScan.cpp@stripped, 2006-09-19 11:15:48+08:00, gni@dev3-127.(none) +2 -2
    Change help info from Ndb.cfg to my.cnf.

  ndb/tools/ndb_config.cpp@stripped, 2006-09-19 11:15:48+08:00, gni@dev3-127.(none) +1 -1
    Change help info from Ndb.cfg to my.cnf

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gni
# Host:	dev3-127.(none)
# Root:	/mnt/mysql/home/ngb/mysql-4.1/mysql-4.1-bug21585

--- 1.8/ndb/tools/ndb_config.cpp	2006-09-19 11:16:52 +08:00
+++ 1.9/ndb/tools/ndb_config.cpp	2006-09-19 11:16:52 +08:00
@@ -64,7 +64,7 @@
   { "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 },
   { "nodes", 256, "Print nodes",

--- 1.9/ndb/test/ndbapi/flexScan.cpp	2006-09-19 11:16:52 +08:00
+++ 1.10/ndb/test/ndbapi/flexScan.cpp	2006-09-19 11:16:52 +08:00
@@ -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 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;

--- 1.7/ndb/include/util/ndb_opts.h	2006-09-19 11:16:52 +08:00
+++ 1.8/ndb/include/util/ndb_opts.h	2006-09-19 11:16:52 +08:00
@@ -49,7 +49,7 @@
   { "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_connect_str, (gptr*) &opt_connect_str, 0, \
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\
   { "ndb-shm", OPT_NDB_SHM,\