diff options
| author | unknown <mronstrom@mysql.com> | 2004-08-07 09:11:18 +0200 |
|---|---|---|
| committer | unknown <mronstrom@mysql.com> | 2004-08-07 09:11:18 +0200 |
| commit | 2cebb9308cb8b40a59b6c945de04c9c9501135ad (patch) | |
| tree | 8b3da5881768d95482ad564ba0efb44e09a7e1ee /ndb/src/common/util/SocketServer.cpp | |
| parent | 901c1db4833d42d2c5ef4351f5f7c2f6e3dd4722 (diff) | |
| parent | 20e8d38bd05e9377fab8673300b44c8deed056f2 (diff) | |
| download | mariadb-git-2cebb9308cb8b40a59b6c945de04c9c9501135ad.tar.gz | |
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
Diffstat (limited to 'ndb/src/common/util/SocketServer.cpp')
| -rw-r--r-- | ndb/src/common/util/SocketServer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ndb/src/common/util/SocketServer.cpp b/ndb/src/common/util/SocketServer.cpp index 44c57c766f8..0cc06a54496 100644 --- a/ndb/src/common/util/SocketServer.cpp +++ b/ndb/src/common/util/SocketServer.cpp @@ -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; |