diff options
| author | unknown <tomas@poseidon.(none)> | 2004-09-09 16:43:11 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-09-09 16:43:11 +0000 |
| commit | dc21dcd2a139c42ba6617fad445ae40bb28cc694 (patch) | |
| tree | a6517579ba7ad3a57f6a9170197d67b1f1798b93 | |
| parent | 96a45ab0663a6172c1c198179188f9db7ec8c5c3 (diff) | |
| parent | 4ea4e9ee2e1a7e8992606278fba6347e1c453785 (diff) | |
| download | mariadb-git-dc21dcd2a139c42ba6617fad445ae40bb28cc694.tar.gz | |
Merge
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
SCCS merged
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 4 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/main.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index db4a1685b12..d0679407460 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -61,6 +61,8 @@ #define DEBUG(x) #endif +extern int global_flag_send_heartbeat_now; + static void CmdBackupCallback(const MgmtSrvr::BackupEvent & event) @@ -2415,7 +2417,7 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId, #endif return true; } - + global_flag_send_heartbeat_now= 1; BaseString type_string, type_c_string; { const char *alias, *str; diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp index 3ca6db70e61..65b4b673dc8 100644 --- a/ndb/src/mgmsrv/main.cpp +++ b/ndb/src/mgmsrv/main.cpp @@ -119,7 +119,7 @@ struct getargs args[] = { "filename" }, { "interactive", 0, arg_flag, &glob.interactive, "Run interactive. Not supported but provided for testing purposes", "" }, - { "nodaemon", 'n', arg_flag, &glob.non_interactive, + { "nodaemon", 0, arg_flag, &glob.non_interactive, "Don't run as daemon, but don't read from stdin", "non-interactive" } }; |