Commit db007003 authored by unknown's avatar unknown
Browse files

ndb - recommit extra version info to real-51 


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  add extra version info to main clone
storage/ndb/include/kernel/NodeInfo.hpp:
  add extra version info to main clone
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  add extra version info to main clone
storage/ndb/include/ndb_version.h.in:
  add extra version info to main clone
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/vm/GlobalData.hpp:
  add extra version info to main clone
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  add extra version info to main clone
parent 3f8ab08b

storage/ndb/include/kernel/GlobalSignalNumbers.h

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_CNTR_START_REP              119

/* 120 not unused */

#define GSN_ROUTE_ORD                   121

/* 122 unused */

#define GSN_NODE_VERSION_REP            122

/* 123 unused */

/* 124 unused */

#define GSN_CHECK_LCP_STOP              125

storage/ndb/include/kernel/NodeInfo.hpp

+10 −0
Original line number Diff line number Diff line
@@ -90,4 +90,14 @@ operator<<(NdbOut& ndbout, const NodeInfo & info){ 
  return ndbout;

}



struct NodeVersionInfo

{

  STATIC_CONST( DataLength = 6 );

  struct 

  {

    Uint32 m_min_version;

    Uint32 m_max_version;

  } m_type [3]; // Indexed as NodeInfo::Type 

};



#endif

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

+2 −1
Original line number Diff line number Diff line
@@ -80,12 +80,13 @@ class ApiRegConf { 
  friend class ClusterMgr;



public:

  STATIC_CONST( SignalLength = 3 + NodeState::DataLength );

  STATIC_CONST( SignalLength = 4 + NodeState::DataLength );

private:

  

  Uint32 qmgrRef;

  Uint32 version; // Version of NDB node

  Uint32 apiHeartbeatFrequency;

  Uint32 minDbVersion;

  NodeState nodeState;

};

storage/ndb/include/ndb_version.h.in

+2 −0
Original line number Diff line number Diff line
@@ -72,5 +72,7 @@ char ndb_version_string_buf[NDB_VERSION_STRING_BUF_SZ]; 


#define NDBD_QMGR_SINGLEUSER_VERSION_5 MAKE_VERSION(5,0,25)



#define NDBD_NODE_VERSION_REP MAKE_VERSION(6,1,1)



#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -637,5 +637,6 @@ const GsnName SignalNames [] = { 
  ,{ GSN_DICT_COMMIT_REQ,  "DICT_COMMIT_REQ"}



  ,{ GSN_ROUTE_ORD, "ROUTE_ORD" }

  ,{ GSN_NODE_VERSION_REP, "NODE_VERSION_REP" }

};

const unsigned short NO_OF_SIGNAL_NAMES = sizeof(SignalNames)/sizeof(GsnName);