From: jonas oreland
Date: January 20 2012 8:04am
Subject: bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4422 to 4423)
List-Archive: http://lists.mysql.com/commits/142447
Message-Id: <20120120080415.BB57D51807C@eel.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4423 jonas oreland	2012-01-20 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 4422 Martin Zaun	2012-01-19 [merge]
      merge from ndb-7.1-ndbjtie-sizeof to ndb-7.1

    modified:
      storage/ndb/include/ndbapi/Ndb.hpp
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/include/ndbapi/NdbOperation.hpp
      storage/ndb/include/ndbapi/NdbScanOperation.hpp
      storage/ndb/src/ndbjtie/NdbApiWrapper.hpp
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb.java
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperationConst.java
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/issues.txt
      storage/ndb/src/ndbjtie/ndbapi_jtie.hpp
=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-01-19 12:08:30 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-01-20 08:03:15 +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).