bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4805 to 4806)

[jonas oreland]

 4806 jonas oreland	2012-01-20
      ndb - fix typo found with new assert (on platforms wo/ epoll). Typo had been there forever, and caused unneeded syscalls (doing nothing). Probably not noticable performance loss...

    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 4805 Jonas Oreland	2012-01-19
      ndb - allow TransporterReceiveData to handle subset of transporters (for mt recv)

    modified:
      storage/ndb/include/transporter/TransporterRegistry.hpp
      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-01-19 11:48:54 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-01-20 07:41:48 +0000
@@ -1238,7 +1238,8 @@ TransporterRegistry::poll_TCP(Uint32 tim
 
   recvdata.m_socket_poller.clear();
 
-  if (m_has_extra_wakeup_socket && recvdata.m_transporters.get(0))
+  bool extra_socket = m_has_extra_wakeup_socket;
+  if (extra_socket && recvdata.m_transporters.get(0))
   {
     const NDB_SOCKET_TYPE socket = m_extra_wakeup_sockets[0];
 
@@ -1270,10 +1271,13 @@ TransporterRegistry::poll_TCP(Uint32 tim
 
   if (tcpReadSelectReply > 0)
   {
-    if (m_extra_wakeup_sockets)
+    if (extra_socket)
     {
       if (recvdata.m_socket_poller.has_read(0))
+      {
+        assert(recvdata.m_transporters.get(0));
         recvdata.m_has_data_transporters.set((Uint32)0);
+      }
     }
 
     for (int i = 0; i < nTCPTransporters; i++)

No bundle (reason: useless for push emails).