1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Post-merge fixes.
This commit is contained in:
mats@mysql.com 2006-06-13 22:10:00 +02:00
parent 8d97b5f855
commit 76473cbaaa
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.h
View File

@ -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:

2
sql/sql_delete.cc
View File

@ -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);