Commit 10ff2215 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
parents 2e385bcb 5c4eb337

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

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

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1789,9 +1789,14 @@ NdbDictInterface::getTable(const BaseString& name, bool fullyQualifiedNames) 


  // Copy name to m_buffer to get a word sized buffer

  m_buffer.clear();

  m_buffer.grow(namelen_words*4);

  m_buffer.grow(namelen_words*4+4);

  m_buffer.append(name.c_str(), namelen);



#ifndef IGNORE_VALGRIND_WARNINGS

  Uint32 pad = 0;

  m_buffer.append(&pad, 4);

#endif

  

  LinearSectionPtr ptr[1];

  ptr[0].p= (Uint32*)m_buffer.get_data();

  ptr[0].sz= namelen_words;

storage/ndb/src/ndbapi/NdbLinHash.hpp

+10 −3
Original line number Diff line number Diff line
@@ -427,19 +427,26 @@ NdbLinHash<C>::getNext(NdbElement_t<C> * curr){ 
    return curr->next;

  

  int dir = 0, seg = 0;



  if(curr != 0){

  int counts;

  if(curr != 0)

  {

    getBucket(curr->hash, &dir, &seg);

    counts = seg + 1;

  }

  else

  {

    counts = 0;

  }

  

  for(int countd = dir; countd < DIRECTORYSIZE;countd++ ){

    if (directory[countd] != 0) {

      for(int counts = seg + 1; counts < SEGMENTSIZE; counts++ ){

      for(; counts < SEGMENTSIZE; counts++ ){

	if (directory[countd]->elements[counts] != 0) {

	  return directory[countd]->elements[counts];

	}   

      }

    }

    counts = 0;

  }



  return 0;