mirror of
https://github.com/MariaDB/server.git
synced 2025-12-06 05:42:06 +03:00
Merge
ndb/include/util/SocketServer.hpp: Auto merged ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged ndb/src/common/util/SocketClient.cpp: Auto merged ndb/src/common/util/SocketServer.cpp: Auto merged ndb/src/common/util/version.c: Auto merged ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/mgmclient/main.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged ndb/src/ndbapi/ClusterMgr.cpp: Auto merged ndb/tools/restore/restore_main.cpp: Auto merged ndb/include/util/ndb_opts.h: merge ndb/src/common/mgmcommon/IPCConfig.cpp: merge ndb/src/common/transporter/TransporterRegistry.cpp: merge ndb/src/mgmapi/mgmapi.cpp: merge ndb/src/mgmclient/CommandInterpreter.cpp: merge ndb/src/mgmsrv/MgmtSrvr.cpp: merge ndb/src/mgmsrv/Services.cpp: merge ndb/src/mgmsrv/main.cpp: merge ndb/src/ndbapi/TransporterFacade.cpp: merge
This commit is contained in:
@@ -64,6 +64,8 @@ SocketServer::tryBind(unsigned short port, const char * intface) {
|
||||
return false;
|
||||
}
|
||||
|
||||
DBUG_PRINT("info",("NDB_SOCKET: %d", sock));
|
||||
|
||||
const int on = 1;
|
||||
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
|
||||
(const char*)&on, sizeof(on)) == -1) {
|
||||
@@ -104,6 +106,8 @@ SocketServer::setup(SocketServer::Service * service,
|
||||
DBUG_RETURN(false);
|
||||
}
|
||||
|
||||
DBUG_PRINT("info",("NDB_SOCKET: %d", sock));
|
||||
|
||||
const int on = 1;
|
||||
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
|
||||
(const char*)&on, sizeof(on)) == -1) {
|
||||
|
||||
Reference in New Issue
Block a user