List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:June 22 2011 8:57am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4475)
View as plain text  
#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:


Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110622085703-t8qym5jnp0bkowyl.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4475) magnus.blaudd22 Jun