mirror of
https://github.com/MariaDB/server.git
synced 2025-12-04 17:23:46 +03:00
Merge
ndb/src/common/mgmcommon/ConfigInfo.cpp: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/common/util/SocketServer.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged ndb/src/kernel/vm/SimulatedBlock.hpp: Auto merged
This commit is contained in:
@@ -147,7 +147,6 @@ SocketServer::doAccept(){
|
||||
ServiceInstance & si = m_services[i];
|
||||
|
||||
if(FD_ISSET(si.m_socket, &readSet)){
|
||||
|
||||
NDB_SOCKET_TYPE childSock = accept(si.m_socket, 0, 0);
|
||||
if(childSock == NDB_INVALID_SOCKET){
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user