bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4457)

[magnus.blaudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:jonas@stripped

 4457 magnus.blaudd@stripped	2011-06-15
      ndb
       - fix warning about unused variable by using it also when ! defined ERROR_INSERT

    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	2011-06-01 07:40:49 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2011-06-15 13:24:40 +0000
@@ -1002,7 +1002,7 @@ TransporterRegistry::pollReceive(Uint32
     {
       for (int i = 0; i < num_socket_events; i++)
       {
-        Uint32 trpid = m_epoll_events[i].data.u32;
+        const Uint32 trpid = m_epoll_events[i].data.u32;
 #ifdef ERROR_INSERT
         if (m_blocked.get(trpid))
         {
@@ -1011,7 +1011,7 @@ TransporterRegistry::pollReceive(Uint32
           continue;
         }
 #endif
-        mask.set(m_epoll_events[i].data.u32);
+        mask.set(trpid);
       }
     }
     else if (num_socket_events < 0)


Attachment: [text/bzr-bundle] bzr/[e-mail]