Commit dc21dcd2 authored by unknown's avatar unknown
Browse files

Merge 


ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  SCCS merged
parents 96a45ab0 4ea4e9ee

ndb/src/mgmsrv/MgmtSrvr.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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;

ndb/src/mgmsrv/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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" }

};