mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

Browse source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
This commit is contained in:
unknown 2006-05-22 16:42:48 +02:00
commit b1b1769e3e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
storage/ndb/src/kernel/vm/Configuration.cpp
View file

@ -49,7 +49,9 @@ extern EventLogger g_eventLogger;
enum ndbd_options { enum ndbd_options {
OPT_INITIAL = NDB_STD_OPTIONS_LAST, OPT_INITIAL = NDB_STD_OPTIONS_LAST,
OPT_NODAEMON, OPT_NODAEMON,
OPT_FOREGROUND OPT_FOREGROUND,
OPT_NOWAIT_NODES,
OPT_INITIAL_START
}; };
NDB_STD_OPTS_VARS; NDB_STD_OPTS_VARS;
@ -88,11 +90,11 @@ static struct my_option my_long_options[] =
" (implies --nodaemon)", " (implies --nodaemon)",
(gptr*) &_foreground, (gptr*) &_foreground, 0, (gptr*) &_foreground, (gptr*) &_foreground, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ "nowait-nodes", NO_ARG, { "nowait-nodes", OPT_NOWAIT_NODES,
"Nodes that will not be waited for during start", "Nodes that will not be waited for during start",
(gptr*) &_nowait_nodes, (gptr*) &_nowait_nodes, 0, (gptr*) &_nowait_nodes, (gptr*) &_nowait_nodes, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{ "initial-start", NO_ARG, { "initial-start", OPT_INITIAL_START,
"Perform initial start", "Perform initial start",
(gptr*) &_initialstart, (gptr*) &_initialstart, 0, (gptr*) &_initialstart, (gptr*) &_initialstart, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },