diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-22 10:34:46 +0100 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-22 10:34:46 +0100 |
| commit | 4e288dc3cf58e6a30ed7b0a92528d31cf82a7224 (patch) | |
| tree | 45acf30dee4358d0e18d71b90e2b43f8ee850082 /ndb | |
| parent | b203723bd8f11a85e05e446850d94ad5f5442028 (diff) | |
| parent | 8f69cbdb2e145d8bbe9f57ff837a979597eaca4a (diff) | |
| download | mariadb-git-4e288dc3cf58e6a30ed7b0a92528d31cf82a7224.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
Diffstat (limited to 'ndb')
| -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; |