Commit 6848be9c authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  manual merge
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/TupFrag.hpp:
  manual merge
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  manual merge
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  manual merge
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  manual merge
storage/ndb/tools/restore/Restore.cpp:
  manual merge
storage/ndb/tools/restore/Restore.hpp:
  manual merge
storage/ndb/tools/restore/consumer_restore.cpp:
  manual merge
parents 98ba03d2 0335013f

sql/ha_ndbcluster.cc

+11 −1
Original line number Diff line number Diff line
@@ -9879,7 +9879,17 @@ uint ha_ndbcluster::set_up_partition_info(partition_info *part_info, 
  } while (++i < part_info->no_parts);

  tab->setDefaultNoPartitionsFlag(part_info->use_default_no_partitions);

  tab->setLinearFlag(part_info->linear_hash_ind);

  tab->setMaxRows(table->s->max_rows);

  {

    ha_rows max_rows= form->s->max_rows;

    ha_rows min_rows= form->s->min_rows;

    if (max_rows < min_rows)

      max_rows= min_rows;

    if (max_rows != (ha_rows)0) /* default setting, don't set fragmentation */

    {

      tab->setMaxRows(max_rows);

      tab->setMaxRows(min_rows);

    }

  }

  tab->setTablespaceNames(ts_names, fd_index*sizeof(char*));

  tab->setFragmentCount(fd_index);

  tab->setFragmentData(&frag_data, fd_index*2);

storage/ndb/include/kernel/GlobalSignalNumbers.h

+3 −1
Original line number Diff line number Diff line
@@ -691,6 +691,8 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_BACKUP_FRAGMENT_REF         546

#define GSN_BACKUP_FRAGMENT_CONF        547



#define GSN_BACKUP_FRAGMENT_COMPLETE_REP 575



#define GSN_STOP_BACKUP_REQ             548

#define GSN_STOP_BACKUP_REF             549

#define GSN_STOP_BACKUP_CONF            550
@@ -740,7 +742,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_SUB_STOP_REQ                572

#define GSN_SUB_STOP_REF                573

#define GSN_SUB_STOP_CONF               574

/*                                      575 unused */

/*                                      575 used */

#define GSN_SUB_CREATE_REQ              576

#define GSN_SUB_CREATE_REF              577

#define GSN_SUB_CREATE_CONF             578

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

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ private: 
    BUFFER_UNDERFLOW  = 1,

    BUFFER_FULL_SCAN  = 2,

    BUFFER_FULL_FRAG_COMPLETE = 3,

    BUFFER_FULL_META  = 4

    BUFFER_FULL_META  = 4,

    BACKUP_FRAGMENT_INFO = 5

  };

};

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

+19 −3
Original line number Diff line number Diff line
@@ -252,15 +252,31 @@ class BackupFragmentConf { 


  friend bool printBACKUP_FRAGMENT_CONF(FILE *, const Uint32 *, Uint32, Uint16);

public:

  STATIC_CONST( SignalLength = 6 );

  STATIC_CONST( SignalLength = 8 );



private:

  Uint32 backupId;

  Uint32 backupPtr;

  Uint32 tableId;

  Uint32 fragmentNo;

  Uint32 noOfRecords;

  Uint32 noOfBytes;

  Uint32 noOfRecordsLow;

  Uint32 noOfBytesLow;

  Uint32 noOfRecordsHigh;

  Uint32 noOfBytesHigh;

};



class BackupFragmentCompleteRep {

public:

  STATIC_CONST( SignalLength = 8 );



  Uint32 backupId;

  Uint32 backupPtr;

  Uint32 tableId;

  Uint32 fragmentNo;

  Uint32 noOfTableRowsLow;

  Uint32 noOfFragmentRowsLow;

  Uint32 noOfTableRowsHigh;

  Uint32 noOfFragmentRowsHigh;

};



class StopBackupReq {

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

+5 −3
Original line number Diff line number Diff line
@@ -201,17 +201,19 @@ class BackupCompleteRep { 


  friend bool printBACKUP_COMPLETE_REP(FILE *, const Uint32 *, Uint32, Uint16);

public:

  STATIC_CONST( SignalLength = 8 + NdbNodeBitmask::Size );

  STATIC_CONST( SignalLength = 10 + NdbNodeBitmask::Size );

private:

  Uint32 senderData;

  Uint32 backupId;

  Uint32 startGCP;

  Uint32 stopGCP;

  Uint32 noOfBytes;

  Uint32 noOfRecords;

  Uint32 noOfBytesLow;

  Uint32 noOfRecordsLow;

  Uint32 noOfLogBytes;

  Uint32 noOfLogRecords;

  NdbNodeBitmask nodes;

  Uint32 noOfBytesHigh;

  Uint32 noOfRecordsHigh;

};



/**