diff options
| author | jonas@perch.ndb.mysql.com <> | 2006-04-10 13:51:43 +0200 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2006-04-10 13:51:43 +0200 |
| commit | a60dfde3fd73979975a478c03227e818d56f7728 (patch) | |
| tree | ed15c81ea78dec4bc43281634a300b037cdcbf38 | |
| parent | 71053ded990c1b833833b6be29896bca2601cb23 (diff) | |
| download | mariadb-git-a60dfde3fd73979975a478c03227e818d56f7728.tar.gz | |
ndb - bug#17607
4.1->5.0 merge
| -rw-r--r-- | ndb/src/kernel/blocks/backup/Backup.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ndb/src/kernel/blocks/backup/Backup.cpp b/ndb/src/kernel/blocks/backup/Backup.cpp index 20903cf0368..ea4009015cb 100644 --- a/ndb/src/kernel/blocks/backup/Backup.cpp +++ b/ndb/src/kernel/blocks/backup/Backup.cpp @@ -88,12 +88,13 @@ Backup::execREAD_CONFIG_REQ(Signal* signal) c_nodePool.setSize(MAX_NDB_NODES); - 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 @@ -102,9 +103,7 @@ Backup::execREAD_CONFIG_REQ(Signal* signal) c_tablePool.setSize(noBackups * noTables); c_attributePool.setSize(noBackups * noAttribs); c_triggerPool.setSize(noBackups * 3 * noTables); - - // 2 = no of replicas - c_fragmentPool.setSize(noBackups * 2 * NO_OF_FRAG_PER_NODE * noTables); + c_fragmentPool.setSize(noBackups * noFrags); Uint32 szMem = 0; ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_MEM, &szMem); |