Commit a440d226 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/dlenev/src/mysql-5.1-merges
parents 76369a5f b00ae812

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ rpl_sp : Bug #16456 
#ndb_dd_disk2memory : Bug #16466 

ndb_autodiscover : Needs to be fixed w.r.t binlog

ndb_autodiscover2 : Needs to be fixed w.r.t binlog

ndb_blob        : BLOB replication causes core in master1 (Pekka will fix)

system_mysql_db : Needs fixing

system_mysql_db_fix : Needs fixing

#ndb_alter_table_row : sometimes wrong error 1015!=1046

sql/ha_ndbcluster_binlog.cc

+2 −2
Original line number Diff line number Diff line
@@ -2729,7 +2729,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);
@@ -2870,7 +2870,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;