diff options
| author | unknown <msvensson@shellback.(none)> | 2006-05-22 20:40:28 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-05-22 20:40:28 +0200 |
| commit | a10e279333330c0723f3f908fb4464087c84054b (patch) | |
| tree | f08728ff419db0b679fd4bf7a46c7ab9edf6996e | |
| parent | a9d12e26fdbce456a08c197fc86fbfb69494875d (diff) | |
| parent | e1dfae7464dd0b5f289084ae85d57718f67377cd (diff) | |
| download | mariadb-git-a10e279333330c0723f3f908fb4464087c84054b.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into shellback.(none):/home/msvensson/mysql/mysql-5.1
| -rw-r--r-- | storage/ndb/src/kernel/vm/Configuration.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/ndb/src/kernel/vm/Configuration.cpp b/storage/ndb/src/kernel/vm/Configuration.cpp index e0e414e5669..12badffe0e0 100644 --- a/storage/ndb/src/kernel/vm/Configuration.cpp +++ b/storage/ndb/src/kernel/vm/Configuration.cpp @@ -49,7 +49,9 @@ extern EventLogger g_eventLogger; enum ndbd_options { OPT_INITIAL = NDB_STD_OPTIONS_LAST, OPT_NODAEMON, - OPT_FOREGROUND + OPT_FOREGROUND, + OPT_NOWAIT_NODES, + OPT_INITIAL_START }; NDB_STD_OPTS_VARS; @@ -88,11 +90,11 @@ static struct my_option my_long_options[] = " (implies --nodaemon)", (gptr*) &_foreground, (gptr*) &_foreground, 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", (gptr*) &_nowait_nodes, (gptr*) &_nowait_nodes, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, - { "initial-start", NO_ARG, + { "initial-start", OPT_INITIAL_START, "Perform initial start", (gptr*) &_initialstart, (gptr*) &_initialstart, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, |