Commit 2d3209a0 authored by unknown's avatar unknown
Browse files

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
parents 1c74bfd8 1030d5c8

storage/ndb/include/util/SocketServer.hpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 
  /**

   * Constructor / Destructor

   */

  SocketServer(int maxSessions = 32);

  SocketServer(unsigned maxSessions = ~(unsigned)0);

  ~SocketServer();

  

  /**

storage/ndb/src/common/util/SocketServer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

support-files/mysql.spec.sh

+1 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ fi 
%attr(755, root, root) %{_bindir}/ndb_desc

%attr(755, root, root) %{_bindir}/ndb_show_tables

%attr(755, root, root) %{_bindir}/ndb_test_platform

%attr(755, root, root) %{_bindir}/ndb_config



%files ndb-extra

%defattr(-,root,root,0755)