diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-04-26 15:16:21 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-04-26 15:16:21 +0200 |
| commit | 2d3209a072a1dedeb812eb89e741911cfb941bf6 (patch) | |
| tree | f78bca21b6c46aa03233d515c137c4c7adc6c5de /storage | |
| parent | 1c74bfd85c89a7a28b1a9f79dfb4d8fe6993ce0d (diff) | |
| parent | 1030d5c80410af68898bd09bd0bb00d6236f0562 (diff) | |
| download | mariadb-git-2d3209a072a1dedeb812eb89e741911cfb941bf6.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
support-files/mysql.spec.sh:
Auto merged
storage/ndb/include/util/SocketServer.hpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/include/util/SocketServer.hpp | 2 | ||||
| -rw-r--r-- | storage/ndb/src/common/util/SocketServer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/ndb/include/util/SocketServer.hpp b/storage/ndb/include/util/SocketServer.hpp index e131b78baa1..e766a0b99c4 100644 --- a/storage/ndb/include/util/SocketServer.hpp +++ b/storage/ndb/include/util/SocketServer.hpp @@ -75,7 +75,7 @@ public: /** * Constructor / Destructor */ - SocketServer(int maxSessions = 32); + SocketServer(unsigned maxSessions = ~(unsigned)0); ~SocketServer(); /** diff --git a/storage/ndb/src/common/util/SocketServer.cpp b/storage/ndb/src/common/util/SocketServer.cpp index 481c656b78b..f0af925cf6d 100644 --- a/storage/ndb/src/common/util/SocketServer.cpp +++ b/storage/ndb/src/common/util/SocketServer.cpp @@ -27,7 +27,7 @@ #define DEBUG(x) ndbout << x << endl; -SocketServer::SocketServer(int maxSessions) : +SocketServer::SocketServer(unsigned maxSessions) : m_sessions(10), m_services(5) { @@ -136,7 +136,7 @@ SocketServer::setup(SocketServer::Service * service, } DBUG_PRINT("info",("bound to %u",ntohs(servaddr.sin_port))); - if (listen(sock, m_maxSessions) == -1){ + if (listen(sock, m_maxSessions > 32 ? 32 : m_maxSessions) == -1){ DBUG_PRINT("error",("listen() - %d - %s", errno, strerror(errno))); NDB_CLOSE_SOCKET(sock); |