diff options
author | unknown <tomas@poseidon.(none)> | 2004-09-10 15:04:40 +0000 |
---|---|---|
committer | unknown <tomas@poseidon.(none)> | 2004-09-10 15:04:40 +0000 |
commit | 0c140b7b48fd4fa7f2209a304de35438a1513c2f (patch) | |
tree | 30388fc018bed4ce46c75ce8a79137a41085b057 /ndb/src/ndbapi/ClusterMgr.cpp | |
parent | dc37e041d22c62e42cc53c3cac8aae50236e32fb (diff) | |
parent | 9c71d59d080647cfc3eb91cd4d514dab2362aead (diff) | |
download | mariadb-git-0c140b7b48fd4fa7f2209a304de35438a1513c2f.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
ndb/src/common/mgmcommon/NdbConfig.c:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/ClusterMgr.cpp')
-rw-r--r-- | ndb/src/ndbapi/ClusterMgr.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ndb/src/ndbapi/ClusterMgr.cpp b/ndb/src/ndbapi/ClusterMgr.cpp index 349bcf4dd34..e10b2e1d82c 100644 --- a/ndb/src/ndbapi/ClusterMgr.cpp +++ b/ndb/src/ndbapi/ClusterMgr.cpp @@ -452,13 +452,11 @@ ClusterMgr::reportNodeFailed(NodeId nodeId){ theNode.nfCompleteRep = false; if(noOfConnectedNodes == 0){ - Uint32 theData[1]; - NFCompleteRep * rep = (NFCompleteRep *)&theData[0]; - + NFCompleteRep rep; for(Uint32 i = 1; i<MAX_NODES; i++){ if(theNodes[i].defined && theNodes[i].nfCompleteRep == false){ - rep->failedNodeId = i; - execNF_COMPLETEREP(theData); + rep.failedNodeId = i; + execNF_COMPLETEREP((Uint32*)&rep); } } } |