Commit f67b138b authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 

into  perch.ndb.mysql.com:/home/jonas/src/41-jonas
parents 20270e43 50037ca8

ndb/src/kernel/blocks/backup/BackupInit.cpp

+4 −5
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ Backup::Backup(const Configuration & conf) : 
  const ndb_mgm_configuration_iterator * p = conf.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_DICT_ATTRIBUTE, &noAttribs));

  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DIH_FRAG_CONNECT, &noFrags));



  noAttribs++; //RT 527 bug fix
@@ -55,8 +55,7 @@ Backup::Backup(const Configuration & conf) : 
  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);