From: magnus.blaudd
Date: June 22 2011 8:57am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4475)
List-Archive: http://lists.mysql.com/commits/139662
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3646670690701968619=="

--===============3646670690701968619==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///data0/magnus/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4475 magnus.blaudd@stripped	2011-06-22
      ndb
       - fix warning about unused variable
       - use bool as datatype for true/false variable

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-06-21 14:12:16 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-06-22 08:57:03 +0000
@@ -881,8 +881,8 @@ MgmtSrvr::sendVersionReq(int v_nodeId,
   ssig.set(ss, TestOrd::TraceAPI, QMGR,
            GSN_API_VERSION_REQ, ApiVersionReq::SignalLength);
 
-  NodeId nodeId;
-  int do_send = 1;
+  NodeId nodeId = 0;
+  bool do_send = true;
   while(true)
   {
     if (do_send)
@@ -898,7 +898,7 @@ MgmtSrvr::sendVersionReq(int v_nodeId,
         return SEND_OR_RECEIVE_FAILED;
       }
 
-      do_send = 0;
+      do_send = false;
     }
 
     SimpleSignal *signal = ss.waitFor();
@@ -925,7 +925,7 @@ MgmtSrvr::sendVersionReq(int v_nodeId,
       const NFCompleteRep * const rep =
 	CAST_CONSTPTR(NFCompleteRep, signal->getDataPtr());
       if (rep->failedNodeId == nodeId)
-	do_send = 1; // retry with other node
+	do_send = true; // retry with other node
       continue;
     }
 
@@ -933,7 +933,7 @@ MgmtSrvr::sendVersionReq(int v_nodeId,
       const NodeFailRep * const rep =
 	CAST_CONSTPTR(NodeFailRep, signal->getDataPtr());
       if (NdbNodeBitmask::get(rep->theNodes,nodeId))
-	do_send = 1; // retry with other node
+	do_send = true; // retry with other node
       continue;
     }
     case GSN_API_REGCONF:


--===============3646670690701968619==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   t8qym5jnp0bkowyl
# target_branch: file:///data0/magnus/mysql/7.0/
# testament_sha1: 2fd195a51f5e0dbb22dfd0c92bf755e10369e5c5
# timestamp: 2011-06-22 10:57:52 +0200
# source_branch: file:///data0/magnus/mysql/7.0-pilot/
# base_revision_id: magnus.blaudd@stripped\
#   zybum1r3e9wfmztk
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYpw3/0AAZ9fgBAwUGP//1Ij
CAC////wUAPZLezey8Onjr17hJJINPRGnpNTzRAGTU0QYjaR6gSiSbQwTUwU0abUA9QNAANBKJpo
mU2U0yBENqHp6oDRoNAYSSRo2qnpqe1R7UQ2kGgeoAAAElCm0ZEyT9KbU9Tam1MGoGmgABmNhfnx
NSHj4/Ulxw3091YnLPldEHrXnPtlN5NLckEqpib/f2qqoZ93gh5PTKML90HdYKyxVhfkhfw58G8m
tHo3v40bO474HSdRgdoVT87/DzfZ3o2NvnHMLZYxmO4iP9fDuV0U8xUHMHQuSPJIsVpSpNUzvLIg
3NgojCDY2E3XP0ZEkQUmgTgdCMEVK8xJFKP86QvgiU6lYzPe1EGTMulaxC2PbqbOVTL7YrQXJL0F
vddKpIML6qCNs0ddrTFVbi9gidBQURcUuQMLX2GwloqjgcTlhJwjY9D7dlhNssCRDU7DC16pKk3N
2zv7NuOSd5vy0UxsbDMUUGgbUibfYpCRHgdRnFHyGOk8dka8TErtpvXPMKKhHxygJ32EpyrLf7EQ
fAwjKzaQnXBDFI4Ty0zVHFyaMFa5feom9q0rRUOyYYUBqiiaYPSRjOBqJB8DjlmjDKhoXH4V0jbJ
azyS2dLLdZToslQXOBF2RZK5gE5LQdT4mSG5inTenXWCRGTJj1gou8mrRi2fLkETZQrD+4y7q6Ui
66CNqRm4lGnLjoReXzvK2l5JHTJex0Ztzv9wF2SKCcbr6LklwMOpPdaY29JqcZqaTdvpZkipI0Mv
nKHFzQq6bPMo8adcylTSK5IuktLXVJGJcxXXR1MD4n/Rga31wLyxnucka2x/FGd22OHtzT5mPSEs
Ts6coeizTNyOG2DGm7J8eJZa2EA0NiKkxt2DX8jikrEVGXD7Jl5v3bSqJpPmOY+yi5dj2JLxU/TD
kiBUQtaIWE2U/PIqgLIRzhR7+E2XUWJxVzB8v1HXkgHrxOYbS3Vmv9fMUthqJLSEjtMBeh3mDUwK
wraEyFupSGD9l3W0oiIcv54ukMj1GNNqeQozUktpqme84hgr4MeeDDdRcDwhU9xVXgQXkKCHsVaR
ocrMdPANa/c9hgCcKbDMsLCd/6kbUQVIKhY/EKKwFr5lbrZlUY80VTeRtV8Ljnzw4i1Gt2ScuScA
aZ3otKd7SRmKeuiNo2bvEK/9RmFJ5og0dZx1FqFzqsLAtE4ZZM4TdTyogEWNNpoz4vE6h3IlmbGc
uJSOcnZvsOCehBHK4JlVCSHv0yYiDQ4zr5UwISgiDF1tHWNLDO1YBFeUfZMbgpyHJKSMV3CyFw4u
d8tSxX+LuSKcKEhFOG/+gA==


--===============3646670690701968619==--