Commit fb2858bc authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents 5e429982 1662b187

storage/ndb/src/mgmsrv/MgmtSrvr.cpp

+4 −0
Original line number Diff line number Diff line
@@ -2136,6 +2136,8 @@ MgmtSrvr::alloc_node_id_req(NodeId free_node_id, enum ndb_mgm_node_type type) 
      {

        do_send = 1;

        nodeId = refToNode(ref->masterRef);

	if (!theFacade->get_node_alive(nodeId))

	  nodeId = 0;

        continue;

      }

      return ref->errorCode;
@@ -2626,6 +2628,8 @@ MgmtSrvr::startBackup(Uint32& backupId, int waitCompleted) 
	ndbout_c("I'm not master resending to %d", nodeId);

#endif

	do_send = 1; // try again

	if (!theFacade->get_node_alive(nodeId))

	  m_master_node = nodeId = 0;

	continue;

      }

      event.Event = BackupEvent::BackupFailedToStart;