diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-02-14 11:55:31 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-02-14 11:55:31 +0700 |
| commit | af4c24bbc7836e26ffe012104b972b41f6ed4e1f (patch) | |
| tree | 1017dbcabeb31f553739726ae26c39a955789e3f /storage/ndb/src/ndbapi/ClusterMgr.cpp | |
| parent | 414f5868d5ede014dccdeb8e831d9fc4d40c1ac0 (diff) | |
| parent | 9467918098a8cf798f3ececc50462f60e9e7579c (diff) | |
| download | mariadb-git-af4c24bbc7836e26ffe012104b972b41f6ed4e1f.tar.gz | |
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
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/SignalSender.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
manual merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
manual merge
storage/ndb/src/ndbapi/SignalSender.cpp:
manual merge
Diffstat (limited to 'storage/ndb/src/ndbapi/ClusterMgr.cpp')
| -rw-r--r-- | storage/ndb/src/ndbapi/ClusterMgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/ndb/src/ndbapi/ClusterMgr.cpp b/storage/ndb/src/ndbapi/ClusterMgr.cpp index b162b85d61e..2a794f69ecb 100644 --- a/storage/ndb/src/ndbapi/ClusterMgr.cpp +++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp @@ -313,7 +313,7 @@ ClusterMgr::showState(NodeId nodeId){ ClusterMgr::Node::Node() : m_state(NodeState::SL_NOTHING) { compatible = nfCompleteRep = true; - connected = defined = m_alive = false; + connected = defined = m_alive = m_api_reg_conf = false; m_state.m_connected_nodes.clear(); } @@ -385,6 +385,8 @@ ClusterMgr::execAPI_REGCONF(const Uint32 * theData){ node.m_info.m_version); } + node.m_api_reg_conf = true; + node.m_state = apiRegConf->nodeState; if (node.compatible && (node.m_state.startLevel == NodeState::SL_STARTED || node.m_state.startLevel == NodeState::SL_SINGLEUSER)){ @@ -501,6 +503,7 @@ ClusterMgr::reportDisconnected(NodeId nodeId){ noOfConnectedNodes--; theNodes[nodeId].connected = false; + theNodes[nodeId].m_api_reg_conf = false; theNodes[nodeId].m_state.m_connected_nodes.clear(); reportNodeFailed(nodeId, true); |