Commit 667c0e93 authored by unknown's avatar unknown
Browse files

Propagating DictTabInfo in signal SubTableData for event TE_ALTER

parent 68c1d22b

storage/ndb/include/kernel/GlobalSignalNumbers.h

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_SUB_SYNC_REQ                582

#define GSN_SUB_SYNC_REF                583

#define GSN_SUB_SYNC_CONF               584

#define GSN_SUB_META_DATA               585

/*                                      585 unused */

#define GSN_SUB_TABLE_DATA              586



#define GSN_CREATE_TABLE_REQ            587

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

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ class AlterTabReq { 
  friend class Dbdih;

  friend class Dbtc;

  friend class Dblqh;

  friend class Suma;



  /**

   * For printing
@@ -103,7 +104,6 @@ class AlterTabConf { 
  friend class Dbtc;

  friend class Dblqh;

  friend class Dbtup;

  friend class Suma;

  

  /**

   * For printing

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ class AlterTableReq { 
   * Sender(s) / Reciver(s)

   */

  friend class NdbTableImpl;

  friend class NdbEventOperationImpl;

  friend class NdbDictInterface;

  friend class Dbdict;

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

+7 −17
Original line number Diff line number Diff line
@@ -277,22 +277,6 @@ struct SubSyncConf { 
  Uint32 senderData;

};



struct SubMetaData {

  /**

   * Sender(s)/Reciver(s)

   */

  friend struct SumaParticipant;

  friend struct Grep;

  

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

  STATIC_CONST( SignalLength = 3 );

  SECTION( DICT_TAB_INFO = 0 );

  

  Uint32 gci;

  Uint32 senderData;

  Uint32 tableId;

};



struct SubTableData {

  /**

   * Sender(s)/Reciver(s)
@@ -301,7 +285,11 @@ struct SubTableData { 
  friend struct Grep;

  

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

  STATIC_CONST( SignalLength = 5 );

  STATIC_CONST( SignalLength = 7 );

  SECTION( DICT_TAB_INFO = 0 );

  SECTION( ATTR_INFO = 0 );

  SECTION( AFTER_VALUES = 1 );

  SECTION( BEFORE_VALUES = 2 );

  

  enum LogType {

    SCAN = 1,
@@ -317,6 +305,8 @@ struct SubTableData { 
  Uint8  ndbd_nodeid;

  Uint8  not_used3;

  Uint32 logType;

  Uint32 changeMask;

  Uint32 totalLen;

};



struct SubSyncContinueReq {

storage/ndb/include/ndbapi/NdbDictionary.hpp

+8 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ public: 


  class Table; // forward declaration

  class Tablespace; // forward declaration

//  class NdbEventOperation; // forward declaration



  /**

   * @class Column
@@ -884,6 +885,7 @@ public: 
  private:

#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

    friend class NdbTableImpl;

    friend class NdbEventOperationImpl;

#endif

    class NdbTableImpl & m_impl;

    Table(NdbTableImpl&);
@@ -1181,6 +1183,12 @@ public: 
     * Get unique identifier for the event

     */

    const char *getName() const;

    /**

     * Get table that the event is defined on

     *

     * @return pointer to table or NULL if no table has been defined

     */

    const NdbDictionary::Table * getTable() const;

    /**

     * Define table on which events should be detected

     *