Commit 5eb8871e authored by unknown's avatar unknown
Browse files

Bug#19066 (DELETE FROM replication inconsistency for NDB): 

Post-merge fixes.


sql/sql_class.h:
  Post-merge fixes
sql/sql_delete.cc:
  Conditional inclusion of row-based code.
parent a8c24bf7

sql/sql_class.h

+0 −1
Original line number Diff line number Diff line
@@ -941,7 +941,6 @@ class THD :public Statement, 
  int binlog_flush_pending_rows_event(bool stmt_end);

  void binlog_delete_pending_rows_event();



#ifdef HAVE_ROW_BASED_REPLICATION

private:

  uint binlog_table_maps; // Number of table maps currently in the binlog

public:

sql/sql_delete.cc

+2 −0
Original line number Diff line number Diff line
@@ -977,7 +977,9 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) 
  thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT);

  ha_enable_transaction(thd, FALSE);

  mysql_init_select(thd->lex);

#ifdef HAVE_ROW_BASED_REPLICATION

  thd->clear_current_stmt_binlog_row_based();

#endif

  error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0,

                      HA_POS_ERROR, LL(0), TRUE);

  ha_enable_transaction(thd, TRUE);