Commit db916d90 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
parents 475acacb 97ba7d51

sql/ha_ndbcluster.cc

+5 −4
Original line number Diff line number Diff line
@@ -5789,7 +5789,6 @@ int ndbcluster_find_all_files(THD *thd) 
  DBUG_ENTER("ndbcluster_find_all_files");

  Ndb* ndb;

  char key[FN_REFLEN];

  NdbDictionary::Dictionary::List list;



  if (!(ndb= check_ndb_in_thd(thd)))

    DBUG_RETURN(HA_ERR_NO_CONNECTION);
@@ -5799,6 +5798,7 @@ int ndbcluster_find_all_files(THD *thd) 
  int unhandled, retries= 5, skipped;

  do

  {

    NdbDictionary::Dictionary::List list;

    if (dict->listObjects(list, NdbDictionary::Object::UserTable) != 0)

      ERR_RETURN(dict->getNdbError());

    unhandled= 0;
@@ -10082,14 +10082,15 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond) 
    }

  }



  dict->listObjects(dflist, NdbDictionary::Object::Undofile);

  NdbDictionary::Dictionary::List uflist;

  dict->listObjects(uflist, NdbDictionary::Object::Undofile);

  ndberr= dict->getNdbError();

  if (ndberr.classification != NdbError::NoError)

    ERR_RETURN(ndberr);



  for (i= 0; i < dflist.count; i++)

  for (i= 0; i < uflist.count; i++)

  {

    NdbDictionary::Dictionary::List::Element& elt= dflist.elements[i];

    NdbDictionary::Dictionary::List::Element& elt= uflist.elements[i];

    Ndb_cluster_connection_node_iter iter;

    unsigned id;

storage/ndb/include/kernel/signaldata/DictTabInfo.hpp

+5 −4
Original line number Diff line number Diff line
@@ -586,7 +586,8 @@ public: 
  enum Unimplemented

  {

    ScanOptimised      = 15, //Default updateOptimised

    AttributeGroup     = 1012 //Default 0

    AttributeGroup     = 1012, //Default 0

    FileNo             = 102

  };

};
@@ -618,13 +619,13 @@ struct DictFilegroupInfo { 
     */

    FileName          = 100,

    FileType          = 101,

    FileId            = 102,

    FileNo            = 103, // Per Filegroup

    FileId            = 103,

    FileFGroupId      = 104,

    FileFGroupVersion = 105,

    FileSizeHi        = 106,

    FileSizeLo        = 107,

    FileFreeExtents   = 108,

    FileVersion       = 109,

    FileEnd           = 199, //    



    /**
@@ -696,8 +697,8 @@ struct DictFilegroupInfo { 
  struct File {

    char FileName[PATH_MAX];

    Uint32 FileType;

    Uint32 FileNo;

    Uint32 FileId;

    Uint32 FileVersion;

    Uint32 FilegroupId;

    Uint32 FilegroupVersion;

    Uint32 FileSizeHi;

storage/ndb/include/kernel/signaldata/DropFilegroup.hpp

+5 −3
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ struct DropFilegroupRef { 
    Busy = 701,

    NotMaster = 702,

    NoSuchFilegroup = 767,

    FilegroupInUse = 768

    FilegroupInUse = 768,

    InvalidSchemaObjectVersion = 774

  };

  

  Uint32 senderData;
@@ -150,7 +151,8 @@ struct DropFileRef { 
    NoError = 0,

    Busy = 701,

    NoSuchFile = 766,

    DropUndoFileNotSupported = 769

    DropUndoFileNotSupported = 769,

    InvalidSchemaObjectVersion = 774

  };



  Uint32 senderData;

storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp

+2 −2
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ SimpleProperties::SP2StructMapping 
DictFilegroupInfo::FileMapping[] = {

  DFGIMAPS(File, FileName, FileName, 0, PATH_MAX),

  DFGIMAP2(File, FileType, FileType, 0, 1),

  DFGIMAP(File, FileNo, FileNo),

  DFGIMAP(File, FileId, FileId),

  DFGIMAP(File, FileVersion, FileVersion),

  DFGIMAP(File, FileFGroupId, FilegroupId),

  DFGIMAP(File, FileFGroupVersion, FilegroupVersion),

  DFGIMAP(File, FileSizeHi, FileSizeHi),
@@ -254,8 +254,8 @@ void 
DictFilegroupInfo::File::init(){

  memset(FileName, sizeof(FileName), 0);

  FileType = ~0;

  FileNo = ~0;

  FileId = ~0;

  FileVersion = ~0;

  FilegroupId = ~0;

  FilegroupVersion = ~0;

  FileSizeHi = 0;

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);