From: Ole John Aske
Date: September 13 2012 9:40am
Subject: bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4973 to 4974)
 Bug#14525176
List-Archive: http://lists.mysql.com/commits/144762
X-Bug: 14525176
Message-Id: <20120913094044.17948.13022.4974@fimafeng09.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4974 Ole John Aske	2012-09-13
      Fix for Bug#14525176 'DUMP 9992' TO SIMULATE BLOCKED TRANSPORTER, AFFECT INCORRECT NODE
      
      node_id, instead if index into transporter array should be used to check/set
      the blocked transporters. 

    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 4973 Ole John Aske	2012-09-13
      Fix for bug#14524939 NDBMTD CRASH AT STARTUP IF CONFIGURED WITH MULTIPLE RECEIVER THREADS
            
      Fix ensures that idx[i] is initialized even if we break the init-loop
      'if (!recvdata.m_transporters.get(node_id))'
            
      Tescase is running the ndb_basic.test with a config specifying multiple
      receiver threads.

    added:
      mysql-test/suite/ndb/t/ndb_mt_recv-master.opt
      mysql-test/suite/ndb/t/ndb_mt_recv.cnf
      mysql-test/suite/ndb/t/ndb_mt_recv.test
    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-09-13 09:04:41 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-09-13 09:35:22 +0000
@@ -1304,10 +1304,10 @@ TransporterRegistry::poll_TCP(Uint32 tim
       {
         Uint32 node_id = t->getRemoteNodeId();
 #ifdef ERROR_INSERT
-        if (m_blocked.get(i))
+        if (m_blocked.get(node_id))
         {
           /* Don't pull from socket now, wait till unblocked */
-          m_blocked_with_data.set(i);
+          m_blocked_with_data.set(node_id);
           continue;
         }
 #endif

No bundle (reason: useless for push emails).