bzr push into mysql-5.1-telco-7.0 branch (pekka.nousiainen:5010 to 5011) WL#5929

[Pekka Nousiainen]

 5011 Pekka Nousiainen	2012-10-27
      wl#5929 sp_marker-x3.diff
      use instance number (not key) in c-a-m list

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 5010 Pekka Nousiainen	2012-10-24
      wl#5929 sp_marker-x2.diff
      handle c-a-m databuffer exhaustion

    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 10:05:26 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-10-27 10:03:43 +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).