diff options
author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-05-09 15:04:45 +0200 |
---|---|---|
committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-05-09 15:04:45 +0200 |
commit | 3d78e6fcd3b99c69416893a30e991aeb51eb6763 (patch) | |
tree | f85d2cb94b5ab6413479f4fd018b84476e61acec /storage/ndb/src/ndbapi/ClusterMgr.cpp | |
parent | 495c6fcea80f6b64791a54ea9f18db0f7ed7b0ba (diff) | |
parent | 198a7991c0738ea4ffbca828aa683020bb6243be (diff) | |
download | mariadb-git-3d78e6fcd3b99c69416893a30e991aeb51eb6763.tar.gz |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
manual merge
Diffstat (limited to 'storage/ndb/src/ndbapi/ClusterMgr.cpp')
-rw-r--r-- | storage/ndb/src/ndbapi/ClusterMgr.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/ndb/src/ndbapi/ClusterMgr.cpp b/storage/ndb/src/ndbapi/ClusterMgr.cpp index 52c95df6d15..f51a5098c53 100644 --- a/storage/ndb/src/ndbapi/ClusterMgr.cpp +++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp @@ -61,6 +61,7 @@ ClusterMgr::ClusterMgr(TransporterFacade & _facade): clusterMgrThreadMutex = NdbMutex_Create(); waitForHBCond= NdbCondition_Create(); waitingForHB= false; + m_max_api_reg_req_interval= 0xFFFFFFFF; // MAX_INT noOfAliveNodes= 0; noOfConnectedNodes= 0; theClusterMgrThread= 0; @@ -243,7 +244,7 @@ ClusterMgr::threadMain( ){ } theFacade.lock_mutex(); - for (int i = 1; i < MAX_NODES; i++){ + for (int i = 1; i < MAX_NDB_NODES; i++){ /** * Send register request (heartbeat) to all available nodes * at specified timing intervals @@ -264,7 +265,8 @@ ClusterMgr::threadMain( ){ } theNode.hbCounter += timeSlept; - if (theNode.hbCounter >= theNode.hbFrequency) { + if (theNode.hbCounter >= m_max_api_reg_req_interval || + theNode.hbCounter >= theNode.hbFrequency) { /** * It is now time to send a new Heartbeat */ |