Commit cee3b44d authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

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


mysql-test/mysql-test-run.sh:
  Auto merged
ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 25652349 d2da3c96

ndb/include/kernel/GlobalSignalNumbers.h

+3 −3
Original line number Diff line number Diff line
@@ -607,8 +607,6 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_WAIT_GCP_REF                500

#define GSN_WAIT_GCP_CONF               501



/* 502 not used */



/**

 * Trigger and index signals

 */
@@ -678,6 +676,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
@@ -727,7 +727,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

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

  };

};

ndb/include/kernel/signaldata/BackupImpl.hpp

+19 −3
Original line number Diff line number Diff line
@@ -258,15 +258,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 {

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;

};



/**

ndb/include/kernel/signaldata/DictTabInfo.hpp

+11 −0
Original line number Diff line number Diff line
@@ -117,9 +117,16 @@ public: 
    CustomTriggerId    = 25,

    FrmLen             = 26,

    FrmData            = 27,



    FragmentCount      = 128, // No of fragments in table (!fragment replicas)

    FragmentDataLen    = 129,

    FragmentData       = 130, // CREATE_FRAGMENTATION reply



    MaxRowsLow         = 139,

    MaxRowsHigh        = 140,

    MinRowsLow         = 143,

    MinRowsHigh        = 144,



    TableEnd           = 999,

    

    AttributeName          = 1000, // String, Mandatory
@@ -263,6 +270,10 @@ public: 
    Uint32 FragmentCount;

    Uint32 FragmentDataLen;

    Uint16 FragmentData[(MAX_FRAGMENT_DATA_BYTES+1)/2];

    Uint32 MaxRowsLow;

    Uint32 MaxRowsHigh;

    Uint32 MinRowsLow;

    Uint32 MinRowsHigh;

    

    void init();

  };