bzr commit into mysql-5.1-telco-7.1 branch (frazer:4017)

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-7.1/ based on revid:frazer@stripped

 4017 Frazer Clement	2010-12-13 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/include/kernel/signaldata/FailRep.hpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
=== modified file 'storage/ndb/include/kernel/signaldata/FailRep.hpp'
--- a/storage/ndb/include/kernel/signaldata/FailRep.hpp	2010-12-13 15:24:10 +0000
+++ b/storage/ndb/include/kernel/signaldata/FailRep.hpp	2010-12-13 16:43:31 +0000
@@ -67,7 +67,7 @@ public:
     if (failCause == ZPARTITIONED_CLUSTER)
     {
       return (sigLen == (SignalLength + PartitionedExtraLength)) ?
-        partitionFailSourceNodeId : 
+        partitioned.partitionFailSourceNodeId : 
         0;
     }
 
@@ -88,7 +88,7 @@ private:
       Uint32 president;
       Uint32 partition[NdbNodeBitmask::Size];
       Uint32 partitionFailSourceNodeId;
-    };
+    } partitioned;
     Uint32 failSourceNodeId;
   };
 };

=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2010-12-13 15:34:50 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2010-12-13 16:52:27 +0000
@@ -1128,9 +1128,9 @@ retry:
     part.assign(NdbNodeBitmask::Size, conf->clusterNodes);
     FailRep* rep = (FailRep*)signal->getDataPtrSend();
     rep->failCause = FailRep::ZPARTITIONED_CLUSTER;
-    rep->president = cpresident;
-    c_clusterNodes.copyto(NdbNodeBitmask::Size, rep->partition);
-    rep->partitionFailSourceNodeId = getOwnNodeId();
+    rep->partitioned.president = cpresident;
+    c_clusterNodes.copyto(NdbNodeBitmask::Size, rep->partitioned.partition);
+    rep->partitioned.partitionFailSourceNodeId = getOwnNodeId();
     Uint32 ref = calcQmgrBlockRef(nodeId);
     Uint32 i = 0;
     /* Send source of event info if a node supports it */
@@ -3612,7 +3612,7 @@ void Qmgr::failReportLab(Signal* signal,
       {
 	jam();
 	NdbNodeBitmask part;
-	part.assign(NdbNodeBitmask::Size, rep->partition);
+	part.assign(NdbNodeBitmask::Size, rep->partitioned.partition);
 	part.getText(buf2);
 	BaseString::snprintf(extra, sizeof(extra),
 			     "Our cluster: %s other cluster: %s",


Attachment: [text/bzr-bundle] bzr/[e-mail]