summaryrefslogtreecommitdiff
path: root/ndb/src/mgmsrv/main.cpp
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.(none)>2004-08-26 14:35:33 +0000
committerunknown <tomas@poseidon.(none)>2004-08-26 14:35:33 +0000
commitc42ce28591de77a01c200cbd2c6cb4ed8be18764 (patch)
treef76eb4de258b4fbef67de97f020eed43115cc6c1 /ndb/src/mgmsrv/main.cpp
parente387719d468da6571f50c9938c50b4091a1065c4 (diff)
downloadmariadb-git-c42ce28591de77a01c200cbd2c6cb4ed8be18764.tar.gz
ndb cluster config fixes, se respective files
mysql-test/ndb/ndb_config_2_node.ini: added new config parameter datadir ndb/include/mgmapi/mgmapi_config_parameters.h: added new config parameter datadir and backup data dir ndb/include/mgmcommon/ConfigRetriever.hpp: changed verify config so that it can be used by mgmt srvr ndb/include/mgmcommon/NdbConfig.h: added option to set path for ndb files ndb/src/common/mgmcommon/ConfigInfo.cpp: changed token names for DB, MGM and API added config parametsers for datadir and backup data dir ndb/src/common/mgmcommon/ConfigRetriever.cpp: changed verify config so that it can be used by mgmt srvr ndb/src/common/mgmcommon/InitConfigFileParser.cpp: no need anymore to make uppercase ndb/src/common/mgmcommon/NdbConfig.c: bugfix+ added method to set datadir ndb/src/kernel/Makefile.am: added debug libs to ndbd ndb/src/kernel/vm/Configuration.cpp: added debug libs to ndbd ndb/src/mgmsrv/MgmtSrvr.cpp: added verify config to mgmt srvr ndb/src/mgmsrv/main.cpp: .
Diffstat (limited to 'ndb/src/mgmsrv/main.cpp')
-rw-r--r--ndb/src/mgmsrv/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp
index 511043e62c9..8e031e42ada 100644
--- a/ndb/src/mgmsrv/main.cpp
+++ b/ndb/src/mgmsrv/main.cpp
@@ -109,7 +109,7 @@ struct getargs args[] = {
"Specify cluster configuration file", "filename" },
#ifndef DBUG_OFF
{ "debug", 0, arg_string, &debug_option,
- "Specify debug option e.d. d:t:i:o,out.trace", "options" },
+ "Specify debug options e.g. d:t:i:o,out.trace", "options" },
#endif
{ "daemon", 'd', arg_flag, &glob.daemon,
"Run ndb_mgmd in daemon mode" },
@@ -143,8 +143,8 @@ NDB_MAIN(mgmsrv){
exit(1);
}
- my_init();
#ifndef DBUG_OFF
+ my_init();
if (debug_option)
DBUG_PUSH(debug_option);
#endif