From: magnus.blaudd
Date: June 22 2011 9:42am
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4257 to 4258)
List-Archive: http://lists.mysql.com/commits/139673
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4258 magnus.blaudd@stripped	2011-06-22 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/include/mgmapi/ndb_logevent.h
      storage/ndb/include/ndb_types.h.in
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
 4257 magnus.blaudd@stripped	2011-06-22
      ndb
       - concatenate the ARG_CLASSPATH variable (which holds a list of strings)
         using platform specific separator before passing it to javac

    modified:
      storage/ndb/config/type_JAVA.cmake
=== modified file 'storage/ndb/include/mgmapi/ndb_logevent.h'
--- a/storage/ndb/include/mgmapi/ndb_logevent.h	2011-04-09 15:48:21 +0000
+++ b/storage/ndb/include/mgmapi/ndb_logevent.h	2011-06-22 08:04:19 +0000
@@ -371,6 +371,7 @@ extern "C" {
     unsigned version;
   };
   struct ndb_logevent_STTORRYRecieved {
+    unsigned unused;
   };
   struct ndb_logevent_StartPhaseCompleted {
     unsigned phase;
@@ -407,6 +408,7 @@ extern "C" {
     unsigned extra;
   };
   struct ndb_logevent_NDBStopAborted {
+    unsigned _unused;
   };
   struct ndb_logevent_StartREDOLog {
     unsigned node;
@@ -436,8 +438,10 @@ extern "C" {
   
   /* NODERESTART */
   struct ndb_logevent_NR_CopyDict {
+    unsigned _unused;
   };
   struct ndb_logevent_NR_CopyDistr {
+    unsigned _unused;
   };
   struct ndb_logevent_NR_CopyFragsStarted {
     unsigned dest_node;
@@ -475,10 +479,13 @@ extern "C" {
     /* TODO */
   };
   struct ndb_logevent_GCP_TakeoverStarted {
+    unsigned _unused;
   };
   struct ndb_logevent_GCP_TakeoverCompleted {
+    unsigned _unused;
   };
   struct ndb_logevent_LCP_TakeoverStarted {
+    unsigned _unused;
   };
   struct ndb_logevent_LCP_TakeoverCompleted {
     unsigned state;
@@ -561,6 +568,7 @@ extern "C" {
   };
   struct ndb_logevent_WarningEvent {
     /* TODO */
+    unsigned _unused;
   };
 
   /* INFO */
@@ -572,6 +580,7 @@ extern "C" {
   };
   struct ndb_logevent_InfoEvent {
     /* TODO */
+    unsigned _unused;
   };
   struct ndb_logevent_EventBufferStatus {
     unsigned usage;
@@ -722,21 +731,21 @@ extern "C" {
     unsigned objectid;
     unsigned version;
     unsigned type;
-    unsigned node; // Node create object
+    unsigned node; /* Node create object */
   };
 
   struct ndb_logevent_AlterSchemaObject {
     unsigned objectid;
     unsigned version;
     unsigned type;
-    unsigned node; // Node create object
+    unsigned node; /* Node create object */
   };
 
   struct ndb_logevent_DropSchemaObject {
     unsigned objectid;
     unsigned version;
     unsigned type;
-    unsigned node; // Node create object
+    unsigned node; /* Node create object */
   };
 
   struct ndb_logevent_StartReadLCP {

=== modified file 'storage/ndb/include/ndb_types.h.in'
--- a/storage/ndb/include/ndb_types.h.in	2011-02-02 09:20:32 +0000
+++ b/storage/ndb/include/ndb_types.h.in	2011-06-22 09:32:00 +0000
@@ -47,15 +47,15 @@ typedef unsigned int   Uint32;
 
 #ifndef INT_MIN64
 #define INT_MIN64       (~0x7FFFFFFFFFFFFFFFLL)
-#endif // !INT_MIN64
+#endif /* !INT_MIN64 */
 
 #ifndef INT_MAX64
 #define INT_MAX64       0x7FFFFFFFFFFFFFFFLL
-#endif // !INT_MAX64
+#endif /* !INT_MAX64 */
 
 #ifndef UINT_MAX64
 #define UINT_MAX64      0xFFFFFFFFFFFFFFFFLL
-#endif // !UINT_MAX64
+#endif /* !UINT_MAX64 */
 
 typedef unsigned int UintR;
 

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-06-21 15:08:34 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-06-22 09:32:00 +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:

No bundle (reason: useless for push emails).