summaryrefslogtreecommitdiff
path: root/ndb/include
diff options
context:
space:
mode:
authorunknown <gni/root@dev3-127.(none)>2006-09-22 20:26:27 +0800
committerunknown <gni/root@dev3-127.(none)>2006-09-22 20:26:27 +0800
commit6c167919a622010b9c464c229945cb38bed641c1 (patch)
tree29996bdaaa7d98c07cc5e6ccf4d818c2a93d0f1a /ndb/include
parent4b08c9faa0732feede0846c1932a1ab7ceb43619 (diff)
parent6cdf3c65a4d0c2e48de0693f40233eb3e70a8b4c (diff)
downloadmariadb-git-6c167919a622010b9c464c229945cb38bed641c1.tar.gz
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
Diffstat (limited to 'ndb/include')
-rw-r--r--ndb/include/util/ndb_opts.h2
1 files changed, 1 insertions, 1 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=<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, \