Commit f0b7821a authored by unknown's avatar unknown
Browse files

ndb - backup 4.1->5.0 merge


ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
parent 8bc693a9
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -114,15 +114,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 = szWrite;
  c_defaults.m_maxWriteSize = maxWriteSize;
  
  { // Init all tables
    ArrayList<Table> tables(c_tablePool);