mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 00:04:33 +01:00
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into perch.ndb.mysql.com:/home/jonas/src/51-jonas
This commit is contained in:
commit
5b8147062e
1 changed files with 3 additions and 4 deletions
|
@ -143,12 +143,13 @@ Backup::execREAD_CONFIG_REQ(Signal* signal)
|
|||
m_ctx.m_config.getOwnConfigIterator();
|
||||
ndbrequire(p != 0);
|
||||
|
||||
Uint32 noBackups = 0, noTables = 0, noAttribs = 0;
|
||||
Uint32 noBackups = 0, noTables = 0, noAttribs = 0, noFrags = 0;
|
||||
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &m_diskless));
|
||||
ndb_mgm_get_int_parameter(p, CFG_DB_PARALLEL_BACKUPS, &noBackups);
|
||||
// ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_TABLES, &noTables));
|
||||
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DICT_TABLE, &noTables));
|
||||
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_ATTRIBUTES, &noAttribs));
|
||||
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DIH_FRAG_CONNECT, &noFrags));
|
||||
|
||||
noAttribs++; //RT 527 bug fix
|
||||
|
||||
|
@ -158,9 +159,7 @@ Backup::execREAD_CONFIG_REQ(Signal* signal)
|
|||
c_tablePool.setSize(noBackups * noTables + 1);
|
||||
c_attributePool.setSize(noBackups * noAttribs + MAX_ATTRIBUTES_IN_TABLE);
|
||||
c_triggerPool.setSize(noBackups * 3 * noTables);
|
||||
|
||||
// 2 = no of replicas
|
||||
c_fragmentPool.setSize(noBackups * NO_OF_FRAG_PER_NODE * noTables + 1);
|
||||
c_fragmentPool.setSize(noBackups * noFrags + 1);
|
||||
|
||||
Uint32 szDataBuf = (2 * 1024 * 1024);
|
||||
Uint32 szLogBuf = (2 * 1024 * 1024);
|
||||
|
|
Loading…
Add table
Reference in a new issue