Commit a8138ec7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
parents 3feaf6e5 c58eade3

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does n 
rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated

rpl_ndb_2myisam          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated

rpl_ndb_auto_inc         : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and auto_increment_offset produce duplicate key er

rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on solaris

rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD

rpl_ndb_ddl              : BUG#18946 result file needs update + test needs to checked

rpl_ndb_innodb2ndb       : BUG#17400 2006-04-19 tomas Cluster Replication: delete & update of rows in table without pk fails on slave.

rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ

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;