Commit 173d093a authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl


sql/ha_ndbcluster_binlog.cc:
  Auto merged
parents ac65eb47 8a7db87e

sql/ha_ndbcluster_binlog.cc

+0 −1
Original line number Diff line number Diff line
@@ -3436,7 +3436,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
        global_system_variables.binlog_format == BINLOG_FORMAT_MIXED)

    {

      ndb_binlog_running= TRUE;

      thd->current_stmt_binlog_row_based= TRUE;     // If in mixed mode

    }

    else

    {

sql/rpl_injector.cc

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ injector::transaction::transaction(MYSQL_BIN_LOG *log, THD *thd) 
  m_start_pos.m_file_pos= log_info.pos;



  begin_trans(m_thd);



  thd->set_current_stmt_binlog_row_based();

}



injector::transaction::~transaction()