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

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

Browse source 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
This commit is contained in:
tomas@whalegate.ndb.mysql.com 2007-03-21 09:28:22 +01:00
commit d2f8bd9ae7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
View file

@ -2136,6 +2136,8 @@ MgmtSrvr::alloc_node_id_req(NodeId free_node_id, enum ndb_mgm_node_type type)
{ {
do_send = 1; do_send = 1;
nodeId = refToNode(ref->masterRef); nodeId = refToNode(ref->masterRef);
if (!theFacade->get_node_alive(nodeId))
nodeId = 0;
continue; continue;
} }
return ref->errorCode; return ref->errorCode;
@ -2626,6 +2628,8 @@ MgmtSrvr::startBackup(Uint32& backupId, int waitCompleted)
ndbout_c("I'm not master resending to %d", nodeId); ndbout_c("I'm not master resending to %d", nodeId);
#endif #endif
do_send = 1; // try again do_send = 1; // try again
if (!theFacade->get_node_alive(nodeId))
m_master_node = nodeId = 0;
continue; continue;
} }
event.Event = BackupEvent::BackupFailedToStart; event.Event = BackupEvent::BackupFailedToStart;