Commit 5bdf4ce4 authored by unknown's avatar unknown
Browse files

ndb - bug#17607 

  4.1->5.0 merge


ndb/src/kernel/blocks/backup/Backup.cpp:
  post merge fix
parent 07a477fa

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

+3 −4
Original line number Diff line number Diff line
@@ -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);