Bug#19066 (DELETE FROM replication inconsistency for NDB):
Post-merge fixes.
This commit is contained in:
parent
8d97b5f855
commit
76473cbaaa
@ -941,7 +941,6 @@ public:
|
|||||||
int binlog_flush_pending_rows_event(bool stmt_end);
|
int binlog_flush_pending_rows_event(bool stmt_end);
|
||||||
void binlog_delete_pending_rows_event();
|
void binlog_delete_pending_rows_event();
|
||||||
|
|
||||||
#ifdef HAVE_ROW_BASED_REPLICATION
|
|
||||||
private:
|
private:
|
||||||
uint binlog_table_maps; // Number of table maps currently in the binlog
|
uint binlog_table_maps; // Number of table maps currently in the binlog
|
||||||
public:
|
public:
|
||||||
|
@ -977,7 +977,9 @@ trunc_by_del:
|
|||||||
thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT);
|
thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT);
|
||||||
ha_enable_transaction(thd, FALSE);
|
ha_enable_transaction(thd, FALSE);
|
||||||
mysql_init_select(thd->lex);
|
mysql_init_select(thd->lex);
|
||||||
|
#ifdef HAVE_ROW_BASED_REPLICATION
|
||||||
thd->clear_current_stmt_binlog_row_based();
|
thd->clear_current_stmt_binlog_row_based();
|
||||||
|
#endif
|
||||||
error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0,
|
error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0,
|
||||||
HA_POS_ERROR, LL(0), TRUE);
|
HA_POS_ERROR, LL(0), TRUE);
|
||||||
ha_enable_transaction(thd, TRUE);
|
ha_enable_transaction(thd, TRUE);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user