Commit 211ae3ee authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
parents 0b88ef9d 53f1a42d

sql/ha_ndbcluster_binlog.cc

+2 −2
Original line number Diff line number Diff line
@@ -2723,7 +2723,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
      {

        // sometimes get TE_ALTER with invalid table

        DBUG_ASSERT(pOp->getEventType() == NdbDictionary::Event::TE_ALTER ||

                    ! IS_NDB_BLOB_PREFIX(pOp->getTable()->getName()));

                    ! IS_NDB_BLOB_PREFIX(pOp->getEvent()->getTable()->getName()));

        ndb->

          setReportThreshEventGCISlip(ndb_report_thresh_binlog_epoch_slip);

        ndb->setReportThreshEventFreeMem(ndb_report_thresh_binlog_mem_usage);
@@ -2864,7 +2864,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
    DBUG_PRINT("info",("removing all event operations"));

    while ((op= ndb->getEventOperation()))

    {

      DBUG_ASSERT(! IS_NDB_BLOB_PREFIX(op->getTable()->getName()));

      DBUG_ASSERT(! IS_NDB_BLOB_PREFIX(op->getEvent()->getTable()->getName()));

      DBUG_PRINT("info",("removing event operation on %s",

                         op->getEvent()->getName()));

      NDB_SHARE *share= (NDB_SHARE*) op->getCustomData();

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 {