Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
commit
ee9723fecb
@ -65,6 +65,7 @@
|
|||||||
#define CFG_DB_BACKUP_DATA_BUFFER_MEM 134
|
#define CFG_DB_BACKUP_DATA_BUFFER_MEM 134
|
||||||
#define CFG_DB_BACKUP_LOG_BUFFER_MEM 135
|
#define CFG_DB_BACKUP_LOG_BUFFER_MEM 135
|
||||||
#define CFG_DB_BACKUP_WRITE_SIZE 136
|
#define CFG_DB_BACKUP_WRITE_SIZE 136
|
||||||
|
#define CFG_DB_BACKUP_MAX_WRITE_SIZE 139
|
||||||
|
|
||||||
#define CFG_LOG_DESTINATION 147
|
#define CFG_LOG_DESTINATION 147
|
||||||
|
|
||||||
|
@ -66,15 +66,16 @@ Backup::Backup(const Configuration & conf) :
|
|||||||
|
|
||||||
Uint32 szDataBuf = (2 * 1024 * 1024);
|
Uint32 szDataBuf = (2 * 1024 * 1024);
|
||||||
Uint32 szLogBuf = (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_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_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_WRITE_SIZE, &szWrite);
|
||||||
|
ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_MAX_WRITE_SIZE, &maxWriteSize);
|
||||||
|
|
||||||
c_defaults.m_logBufferSize = szLogBuf;
|
c_defaults.m_logBufferSize = szLogBuf;
|
||||||
c_defaults.m_dataBufferSize = szDataBuf;
|
c_defaults.m_dataBufferSize = szDataBuf;
|
||||||
c_defaults.m_minWriteSize = szWrite;
|
c_defaults.m_minWriteSize = szWrite;
|
||||||
c_defaults.m_maxWriteSize = szWrite;
|
c_defaults.m_maxWriteSize = maxWriteSize;
|
||||||
|
|
||||||
{ // Init all tables
|
{ // Init all tables
|
||||||
ArrayList<Table> tables(c_tablePool);
|
ArrayList<Table> tables(c_tablePool);
|
||||||
|
@ -1191,7 +1191,19 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
|
|||||||
false,
|
false,
|
||||||
ConfigInfo::CI_INT,
|
ConfigInfo::CI_INT,
|
||||||
"32K",
|
"32K",
|
||||||
"0",
|
"2K",
|
||||||
|
STR_VALUE(MAX_INT_RNIL) },
|
||||||
|
|
||||||
|
{
|
||||||
|
CFG_DB_BACKUP_MAX_WRITE_SIZE,
|
||||||
|
"BackupMaxWriteSize",
|
||||||
|
DB_TOKEN,
|
||||||
|
"Max size of filesystem writes made by backup (in bytes)",
|
||||||
|
ConfigInfo::CI_USED,
|
||||||
|
false,
|
||||||
|
ConfigInfo::CI_INT,
|
||||||
|
"256K",
|
||||||
|
"2K",
|
||||||
STR_VALUE(MAX_INT_RNIL) },
|
STR_VALUE(MAX_INT_RNIL) },
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
|
Loading…
x
Reference in New Issue
Block a user