Commit 9f46b3b5 authored by unknown's avatar unknown
Browse files

Merge jonas@perch:src/mysql-4.1 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


support-files/mysql.spec.sh:
  Auto merged
parents e3996585 2dce78e8

ndb/include/mgmapi/mgmapi_config_parameters.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#define CFG_DB_BACKUP_DATA_BUFFER_MEM     134

#define CFG_DB_BACKUP_LOG_BUFFER_MEM      135

#define CFG_DB_BACKUP_WRITE_SIZE          136

#define CFG_DB_BACKUP_MAX_WRITE_SIZE      139



#define CFG_LOG_DESTINATION           147

ndb/include/util/SocketServer.hpp

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

   * Constructor / Destructor

   */

  SocketServer(int maxSessions = 32);

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

  ~SocketServer();

  

  /**

ndb/src/common/transporter/Transporter.cpp

+6 −6
Original line number Diff line number Diff line
@@ -100,10 +100,10 @@ Transporter::connect_server(NDB_SOCKET_TYPE sockfd) { 
  }

  

  {

    struct sockaddr addr;

    struct sockaddr_in addr;

    SOCKET_SIZE_TYPE addrlen= sizeof(addr);

    int r= getpeername(sockfd, &addr, &addrlen);

    m_connect_address= ((struct sockaddr_in *)&addr)->sin_addr;

    int r= getpeername(sockfd, (struct sockaddr*)&addr, &addrlen);

    m_connect_address= (&addr)->sin_addr;

  }



  bool res = connect_server_impl(sockfd);
@@ -173,10 +173,10 @@ Transporter::connect_client() { 
  }



  {

    struct sockaddr addr;

    struct sockaddr_in addr;

    SOCKET_SIZE_TYPE addrlen= sizeof(addr);

    int r= getpeername(sockfd, &addr, &addrlen);

    m_connect_address= ((struct sockaddr_in *)&addr)->sin_addr;

    int r= getpeername(sockfd, (struct sockaddr*)&addr, &addrlen);

    m_connect_address= (&addr)->sin_addr;

  }



  bool res = connect_client_impl(sockfd);

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)

{
@@ -124,7 +124,7 @@ SocketServer::setup(SocketServer::Service * service, 
    DBUG_RETURN(false);

  }

  

  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);

ndb/src/kernel/blocks/backup/BackupInit.cpp

+3 −2
Original line number Diff line number Diff line
@@ -66,15 +66,16 @@ Backup::Backup(const Configuration & conf) : 


  Uint32 szDataBuf = (2 * 1024 * 1024);

  Uint32 szLogBuf = (2 * 1024 * 1024);

  Uint32 szWrite = 32768;

  Uint32 szWrite = 32768, maxWriteSize = (256 * 1024);

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_DATA_BUFFER_MEM, &szDataBuf);

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_LOG_BUFFER_MEM, &szLogBuf);

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_WRITE_SIZE, &szWrite);

  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_MAX_WRITE_SIZE, &maxWriteSize);

  

  c_defaults.m_logBufferSize = szLogBuf;

  c_defaults.m_dataBufferSize = szDataBuf;

  c_defaults.m_minWriteSize = szWrite;

  c_defaults.m_maxWriteSize = szWrite;

  c_defaults.m_maxWriteSize = maxWriteSize;

  

  { // Init all tables

    ArrayList<Table> tables(c_tablePool);