From: Jonas Oreland Date: January 18 2012 1:44pm Subject: bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4417 to 4418) List-Archive: http://lists.mysql.com/commits/142476 Message-Id: <20120118134435.0945755C19E@perch.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4418 Jonas Oreland 2012-01-18 [merge] ndb - merge 70 to 71 modified: storage/ndb/src/common/transporter/TransporterRegistry.cpp 4417 Jonas Oreland 2012-01-18 [merge] ndb - merge 70 to 71 modified: storage/ndb/include/kernel/ndb_limits.h storage/ndb/src/common/transporter/TransporterRegistry.cpp storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp === modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp' --- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2012-01-18 09:37:48 +0000 +++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2012-01-18 13:44:10 +0000 @@ -1303,8 +1303,9 @@ TransporterRegistry::performReceive(Tran #endif #ifdef NDB_TCP_TRANSPORTER - Uint32 id = 0; - while ((id = recvdata.m_has_data_transporters.find(id + 1)) != BitmaskImpl::NotFound) + for(Uint32 id = recvdata.m_has_data_transporters.find_first(); + id != BitmaskImpl::NotFound; + id = recvdata.m_has_data_transporters.find_next(id + 1)) { bool hasdata = false; TCP_Transporter * t = (TCP_Transporter*)theTransporters[id]; No bundle (reason: useless for push emails).