diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-03-21 09:06:14 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-03-21 09:06:14 +0100 |
| commit | ca19097cbcce7c249bb48d90a8ca19e956cd83f0 (patch) | |
| tree | 6308ce9fcd760e7ab08198dcfbfc14558e73fc49 | |
| parent | 4384879603faa6fafaf1ca5ce952c666968c0f6e (diff) | |
| parent | 34a9dd6a5e1bb9a1823adc0a25a97cff42dbbd0f (diff) | |
| download | mariadb-git-ca19097cbcce7c249bb48d90a8ca19e956cd83f0.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index 5635d5b4420..3d7eb5bd4f1 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -2494,6 +2494,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; |