Commit 84023b7b authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents 67347ba3 0c3bb2f8

storage/ndb/include/debugger/EventLogger.hpp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <logger/Logger.hpp>

#include <logger/FileLogHandler.hpp>

#include "GrepError.hpp"

#include <kernel/kernel_types.h>

#include <kernel/LogLevel.hpp>

#include <kernel/signaldata/EventReport.hpp>

storage/ndb/include/kernel/GlobalSignalNumbers.h

+73 −79
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_ADD_FRAGREF                 110

#define GSN_ADD_FRAGREQ                 111



#define GSN_API_START_REP               120

#define GSN_API_FAILCONF                113

#define GSN_API_FAILREQ                 114

#define GSN_CNTR_START_REQ              115
@@ -176,7 +177,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_CNTR_START_REF              117

#define GSN_CNTR_START_CONF             118

#define GSN_CNTR_START_REP              119

/* 120 unused */

/* 120 not unused */

/* 121 unused */

/* 122 unused */

/* 123 unused */
@@ -592,6 +593,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_BLOCK_COMMIT_ORD            485

#define GSN_UNBLOCK_COMMIT_ORD          486



#define GSN_NODE_START_REP              502

#define GSN_NODE_STATE_REP              487

#define GSN_CHANGE_NODE_STATE_REQ       488

#define GSN_CHANGE_NODE_STATE_CONF      489
@@ -612,7 +614,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_WAIT_GCP_REF                500

#define GSN_WAIT_GCP_CONF               501



/* 502 not used */

/* 502 used */



/**

 * Trigger and index signals
@@ -774,66 +776,59 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_ALTER_INDX_REF              604

#define GSN_ALTER_INDX_CONF             605



/**

 * Grep signals

 */

#define GSN_ALTER_TABLE_REP             606

#define GSN_API_BROADCAST_REP           607

#define GSN_GREP_SUB_CREATE_CONF        608

#define GSN_GREP_CREATE_REQ             609

#define GSN_GREP_CREATE_REF             610

#define GSN_GREP_CREATE_CONF            611



#define GSN_GREP_SUB_START_REQ          612

#define GSN_GREP_SUB_START_REF          613

#define GSN_GREP_SUB_START_CONF         614

#define GSN_GREP_START_REQ              615

#define GSN_GREP_START_REF              616

#define GSN_GREP_START_CONF             617



#define GSN_GREP_SUB_SYNC_REQ	        618

#define GSN_GREP_SUB_SYNC_REF	        619

#define GSN_GREP_SUB_SYNC_CONF          620

#define GSN_GREP_SYNC_REQ               621

#define GSN_GREP_SYNC_REF               622

#define GSN_GREP_SYNC_CONF              623



/**

 * REP signals

 */

#define GSN_REP_WAITGCP_REQ             627

#define GSN_REP_WAITGCP_REF             628

#define GSN_REP_WAITGCP_CONF            629

#define GSN_GREP_WAITGCP_REQ            630

#define GSN_GREP_WAITGCP_REF            631

#define GSN_GREP_WAITGCP_CONF           632

#define GSN_REP_GET_GCI_REQ		633

#define GSN_REP_GET_GCI_REF		634

#define GSN_REP_GET_GCI_CONF		635

#define GSN_REP_GET_GCIBUFFER_REQ      	636

#define GSN_REP_GET_GCIBUFFER_REF      	637

#define GSN_REP_GET_GCIBUFFER_CONF     	638

#define GSN_REP_INSERT_GCIBUFFER_REQ  	639

#define GSN_REP_INSERT_GCIBUFFER_REF    640

#define GSN_REP_INSERT_GCIBUFFER_CONF	641

#define GSN_REP_CLEAR_PS_GCIBUFFER_REQ  642

#define GSN_REP_CLEAR_PS_GCIBUFFER_REF  643

#define GSN_REP_CLEAR_PS_GCIBUFFER_CONF 644

#define GSN_REP_CLEAR_SS_GCIBUFFER_REQ  645

#define GSN_REP_CLEAR_SS_GCIBUFFER_REF  646

#define GSN_REP_CLEAR_SS_GCIBUFFER_CONF 647

#define GSN_REP_DATA_PAGE	  	648

#define GSN_REP_GCIBUFFER_ACC_REP 	649



#define GSN_GREP_SUB_REMOVE_REQ	        650

#define GSN_GREP_SUB_REMOVE_REF	        651

#define GSN_GREP_SUB_REMOVE_CONF        652

#define GSN_GREP_REMOVE_REQ             653

#define GSN_GREP_REMOVE_REF             654

#define GSN_GREP_REMOVE_CONF            655



/* Start Global Replication */

#define GSN_GREP_REQ                    656

#define GSN_608

#define GSN_609

#define GSN_610

#define GSN_611



#define GSN_612

#define GSN_613

#define GSN_614

#define GSN_615

#define GSN_616

#define GSN_617



#define GSN_618

#define GSN_619

#define GSN_620

#define GSN_621

#define GSN_622

#define GSN_623



#define GSN_627

#define GSN_628

#define GSN_629

#define GSN_630

#define GSN_631

#define GSN_632

#define GSN_633

#define GSN_634

#define GSN_635

#define GSN_636

#define GSN_637

#define GSN_638

#define GSN_639

#define GSN_640

#define GSN_641

#define GSN_642

#define GSN_643

#define GSN_644

#define GSN_645

#define GSN_646

#define GSN_647

#define GSN_648

#define GSN_649



#define GSN_650

#define GSN_651

#define GSN_652

#define GSN_653

#define GSN_654

#define GSN_655



#define GSN_656



/**

 * Management server
@@ -864,13 +859,12 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_CREATE_SUBID_REF            662      

#define GSN_CREATE_SUBID_CONF           663      



/* GREP */

#define GSN_GREP_CREATE_SUBID_REQ       664      

#define GSN_GREP_CREATE_SUBID_REF       665

#define GSN_GREP_CREATE_SUBID_CONF      666    

#define GSN_REP_DROP_TABLE_REQ          667      

#define GSN_REP_DROP_TABLE_REF          668

#define GSN_REP_DROP_TABLE_CONF         669    

#define GSN_664      

#define GSN_665

#define GSN_666    

#define GSN_667      

#define GSN_668

#define GSN_669    



/*

 * TUX
@@ -911,27 +905,27 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
/**

 * SUMA restart protocol

 */

#define GSN_SUMA_START_ME               691

#define GSN_SUMA_START_ME_REQ           691

#define GSN_SUMA_START_ME_REF           694

#define GSN_SUMA_START_ME_CONF          695

#define GSN_SUMA_HANDOVER_REQ           692

#define GSN_SUMA_HANDOVER_REF           696

#define GSN_SUMA_HANDOVER_CONF          693



/* not used                             694 */

/* not used                             695 */

/* not used                             696 */

/* used 694 */

/* used 695 */

/* used 696 */



/**

 * GREP restart protocol

 */

#define GSN_GREP_START_ME              706

#define GSN_GREP_ADD_SUB_REQ           707

#define GSN_GREP_ADD_SUB_REF           708

#define GSN_GREP_ADD_SUB_CONF          709

#define GSN_706

#define GSN_707

#define GSN_708

#define GSN_709





/*

 * EVENT Signals

 */

#define GSN_SUB_GCP_COMPLETE_ACC        699

#define GSN_SUB_GCP_COMPLETE_ACK        699



#define GSN_CREATE_EVNT_REQ             700

#define GSN_CREATE_EVNT_CONF            701

storage/ndb/include/kernel/NodeInfo.hpp

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ public: 
    DB  = NODE_TYPE_DB,      ///< Database node

    API = NODE_TYPE_API,      ///< NDB API node

    MGM = NODE_TYPE_MGM,      ///< Management node  (incl. NDB API)

    REP = NODE_TYPE_REP,      ///< Replication node (incl. NDB API)

    INVALID = 255 ///< Invalid type

  };

  NodeType getType() const;
@@ -76,9 +75,6 @@ operator<<(NdbOut& ndbout, const NodeInfo & info){ 
  case NodeInfo::MGM:

    ndbout << "MGM";

    break;

  case NodeInfo::REP:

    ndbout << "REP";

    break;

  case NodeInfo::INVALID:

    ndbout << "INVALID";

    break;

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

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ class AlterTabConf { 
  friend class Dbtc;

  friend class Dblqh;

  friend class Dbtup;

  friend class Suma;

  

  /**

   * For printing

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

+53 −16
Original line number Diff line number Diff line
@@ -94,6 +94,13 @@ class DropEvntRef { 
  friend bool printDROP_EVNT_REF(FILE*, const Uint32*, Uint32, Uint16);



public:

  enum ErrorCode {

    NoError = 0,

    Undefined = 1,

    NF_FakeErrorREF = 11,

    Busy = 701

  };

#if 0

  enum ErrorCode {

    NoError = 0,

    Undefined = 1,
@@ -115,7 +122,7 @@ public: 
    InvalidAttributeOrder = 4255,

    Temporary = 0x1 << 16

  };



#endif

  STATIC_CONST( SignalLength = 5 );



  union {             // user block reference
@@ -132,7 +139,7 @@ public: 
  };

  Uint32 m_errorLine;

  Uint32 m_errorNode;



#if 0

  bool isTemporary() const

  { return (errorCode &  Temporary) > 0; }
@@ -141,7 +148,7 @@ public: 


  ErrorCode setTemporary(ErrorCode ec)

  { return (ErrorCode) (errorCode = ((Uint32) ec | (Uint32)Temporary)); }



#endif

  Uint32 getUserRef() const {

    return m_userRef;

  }
@@ -154,11 +161,11 @@ public: 
  void setUserData(Uint32 val) {

    m_userData = val;

  }

  DropEvntRef::ErrorCode getErrorCode() const {

    return (DropEvntRef::ErrorCode)m_errorCode;

  Uint32 getErrorCode() const {

    return m_errorCode;

  }

  void setErrorCode(DropEvntRef::ErrorCode val) {

    m_errorCode = (Uint32)val;

  void setErrorCode(Uint32 val) {

    m_errorCode = val;

  }

  Uint32 getErrorLine() const {

    return m_errorLine;
@@ -193,8 +200,8 @@ struct CreateEvntReq { 
    //    RT_TC = 5 << 8

  };

  STATIC_CONST( SignalLengthGet = 3 );

  STATIC_CONST( SignalLengthCreate = 5+MAXNROFATTRIBUTESINWORDS );

  STATIC_CONST( SignalLength = 7+MAXNROFATTRIBUTESINWORDS );

  STATIC_CONST( SignalLengthCreate = 6+MAXNROFATTRIBUTESINWORDS );

  STATIC_CONST( SignalLength = 8+MAXNROFATTRIBUTESINWORDS );

  //  SECTION( ATTRIBUTE_LIST_SECTION = 0 );

  SECTION( EVENT_NAME_SECTION = 0 );
@@ -208,6 +215,7 @@ struct CreateEvntReq { 
  };

  Uint32 m_requestInfo;

  Uint32 m_tableId;             // table to event

  Uint32 m_tableVersion;        // table version

  AttributeMask::Data m_attrListBitmask;

  Uint32 m_eventType;           // from DictTabInfo::TableType

  Uint32 m_eventId;             // event table id set by DICT/SUMA
@@ -245,6 +253,12 @@ struct CreateEvntReq { 
  void setTableId(Uint32 val) {

    m_tableId = val;

  }

  Uint32 getTableVersion() const {

    return m_tableVersion;

  }

  void setTableVersion(Uint32 val) {

    m_tableVersion = val;

  }

  AttributeMask getAttrListBitmask() const {

    AttributeMask tmp;

    tmp.assign(m_attrListBitmask);
@@ -281,7 +295,7 @@ class CreateEvntConf { 


public:

  //  STATIC_CONST( InternalLength = 3 );

  STATIC_CONST( SignalLength = 7+MAXNROFATTRIBUTESINWORDS );

  STATIC_CONST( SignalLength = 8+MAXNROFATTRIBUTESINWORDS );



  union {

    Uint32 m_userRef;             // user block reference
@@ -293,6 +307,7 @@ public: 
  };

  Uint32 m_requestInfo;

  Uint32 m_tableId;

  Uint32 m_tableVersion;        // table version

  AttributeMask m_attrListBitmask;

  Uint32 m_eventType;

  Uint32 m_eventId;
@@ -322,6 +337,12 @@ public: 
  void setTableId(Uint32 val) {

    m_tableId = val;

  }

  Uint32 getTableVersion() const {

    return m_tableVersion;

  }

  void setTableVersion(Uint32 val) {

    m_tableVersion = val;

  }

  AttributeMask getAttrListBitmask() const {

    return m_attrListBitmask;

  }
@@ -355,7 +376,14 @@ struct CreateEvntRef { 
  friend class SafeCounter;

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



  STATIC_CONST( SignalLength = 10 );

  STATIC_CONST( SignalLength = 11 );

  enum ErrorCode {

    NoError = 0,

    Undefined = 1,

    NF_FakeErrorREF = 11,

    Busy = 701

  };

#if 0

  enum ErrorCode {

    NoError = 0,

    Undefined = 1,
@@ -383,6 +411,7 @@ struct CreateEvntRef { 
  void setTemporary();

  ErrorCode setTemporary(ErrorCode ec);

  static ErrorCode makeTemporary(ErrorCode ec);

#endif



  union {

    Uint32 m_userRef;             // user block reference
@@ -395,6 +424,7 @@ struct CreateEvntRef { 


  Uint32 m_requestInfo;

  Uint32 m_tableId;

  Uint32 m_tableVersion;        // table version

  Uint32 m_eventType;

  Uint32 m_eventId;

  Uint32 m_eventKey;
@@ -434,6 +464,12 @@ struct CreateEvntRef { 
  void setTableId(Uint32 val) {

    m_tableId = val;

  }

  Uint32 getTableVersion() const {

    return m_tableVersion;

  }

  void setTableVersion(Uint32 val) {

    m_tableVersion = val;

  }



  Uint32 getEventType() const {

    return m_eventType;
@@ -454,11 +490,11 @@ struct CreateEvntRef { 
    m_eventKey = val;

  }



  CreateEvntRef::ErrorCode getErrorCode() const {

    return (CreateEvntRef::ErrorCode)errorCode;

  Uint32 getErrorCode() const {

    return errorCode;

  }

  void setErrorCode(CreateEvntRef::ErrorCode val) {

    errorCode = (Uint32)val;

  void setErrorCode(Uint32 val) {

    errorCode = val;

  }

  Uint32 getErrorLine() const {

    return m_errorLine;
@@ -473,6 +509,7 @@ struct CreateEvntRef { 
    m_errorNode = val;

  }

};

#if 0

inline bool CreateEvntRef::isTemporary() const

{ return (errorCode &  CreateEvntRef::Temporary) > 0; }

inline void CreateEvntRef::setTemporary()
@@ -483,5 +520,5 @@ inline CreateEvntRef::ErrorCode CreateEvntRef::setTemporary(ErrorCode ec) 
inline CreateEvntRef::ErrorCode CreateEvntRef::makeTemporary(ErrorCode ec)

{ return (CreateEvntRef::ErrorCode) 

    ( (Uint32) ec | (Uint32)CreateEvntRef::Temporary ); }



#endif

#endif