Commit 0f0c5f55 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
parents f94b1db4 bbe7563a

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,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

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

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

+3 −2
Original line number Diff line number Diff line
@@ -163,15 +163,16 @@ Backup::execREAD_CONFIG_REQ(Signal* signal) 
  

  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 = 256*1024;

  c_defaults.m_maxWriteSize = maxWriteSize;

  c_defaults.m_lcp_buffer_size = szDataBuf;

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp

+2 −1
Original line number Diff line number Diff line
@@ -3130,6 +3130,7 @@ Dbtup::nr_delete(Signal* signal, Uint32 senderData, 
    }



    PagePtr disk_page = *(PagePtr*)&m_pgman.m_ptr;

    disk_page_set_dirty(disk_page);



    preq.m_callback.m_callbackFunction =

      safe_cast(&Dbtup::nr_delete_logbuffer_callback);
@@ -3164,7 +3165,7 @@ Dbtup::nr_delete_page_callback(Signal* signal, 
  Ptr<GlobalPage> gpage;

  m_global_page_pool.getPtr(gpage, page_id);

  PagePtr pagePtr= *(PagePtr*)&gpage;



  disk_page_set_dirty(pagePtr);

  Dblqh::Nr_op_info op;

  op.m_ptr_i = userpointer;

  op.m_disk_ref.m_page_no = pagePtr.p->m_page_no;