bzr push into mysql-5.1-telco-7.1 branch (ole.john.aske:4603 to 4604)

[Ole John Aske]

 4604 Ole John Aske	2012-09-13 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 4603 Ole John Aske	2012-09-13 [merge]
      Merge 7.0 -> 7.1

    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:09:37 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-09-13 09:36:35 +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).