From: Pekka Nousiainen
Date: October 27 2012 1:17pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (pekka.nousiainen:4632 to 4633)
List-Archive: http://lists.mysql.com/commits/145125
Message-Id: <20121027131708.29836.98127.4633@cuda>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4633 Pekka Nousiainen	2012-10-27 [merge]
      merge to 7.1

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4632 Pekka Nousiainen	2012-10-24 [merge]
      merge to 7.1

    modified:
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testBasic.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-10-24 11:04:41 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-10-27 11:45:58 +0000
@@ -4255,7 +4255,11 @@ Dbtc::CommitAckMarker::insert_in_commit_
                                                    Uint32 instanceKey,
                                                    NodeId node_id)
 {
-  Uint32 item = instanceKey + (node_id << 16);
+  const NodeInfo& nodeInfo = tc->getNodeInfo(node_id);
+  Uint32 workers = nodeInfo.m_lqh_workers;
+  assert(instanceKey != 0);
+  Uint32 instanceNo = workers == 0 ? 0 : 1 + (instanceKey - 1) % workers;
+  Uint32 item = instanceNo + (node_id << 16);
   CommitAckMarkerBuffer::DataBufferPool & pool =
     tc->c_theCommitAckMarkerBufferPool;
   // check for duplicate (todo DataBuffer method find-or-append)

No bundle (reason: useless for push emails).