From: Frazer Clement
Date: November 28 2012 11:11pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:5052 to 5053)
 Bug#15908907
List-Archive: http://lists.mysql.com/commits/145406
X-Bug: 15908907
Message-Id: <201211282311.qASNBSDH029803@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5053 Frazer Clement	2012-11-28
      Bug #15908907 	NDB : ALL REPORT BACKUP HITS ERROR WITH MULTITHREADED DA
      TA NODES
      
      Fix warning.

    modified:
      storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp
 5052 Frazer Clement	2012-11-28
      Bug #15908907 	NDB : ALL REPORT BACKUP HITS ERROR WITH MULTITHREADED DATA NODES
      
      Multithreaded data nodes have multiple Backup 'block' instances.
      This confused the MGMD implementation of ALL REPORT BACKUP, which expected
      one report per node.
      
      This patch adds some aggregation in the BackupProxy block so that only
      one report is returned.
      
      A configuration covering this scenario is added to ndb_mgm test.

    added:
      mysql-test/suite/ndb/t/ndb_mgm.cnf
    modified:
      mysql-test/suite/ndb/r/ndb_mgm.result
      mysql-test/suite/ndb/t/ndb_mgm.test
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp
      storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp
=== modified file 'storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp'
--- a/storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp	2012-11-28 16:01:52 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp	2012-11-28 23:03:32 +0000
@@ -190,7 +190,7 @@ BackupProxy::sendSUM_EVENT_REP(Signal* s
   };
   
   /* Words 3 -> 10 , various sums */
-  for (int w = 3; w < reportLen; w++)
+  for (Uint32 w = 3; w < reportLen; w++)
     ss.m_report[w] += signal->theData[w];
   
   if (!lastReply(ss))

No bundle (reason: useless for push emails).