diff options
| author | unknown <mats@mysql.com> | 2006-06-13 22:10:00 +0200 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-06-13 22:10:00 +0200 |
| commit | 5eb8871e74a72221e3617ebad428f0e2733a0e3d (patch) | |
| tree | 26180fa62283a76680c643a3b117b5780d88bba1 | |
| parent | a8c24bf75eea891468bfdb325d56610b322d1c14 (diff) | |
| download | mariadb-git-5eb8871e74a72221e3617ebad428f0e2733a0e3d.tar.gz | |
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.
| -rw-r--r-- | sql/sql_class.h | 1 | ||||
| -rw-r--r-- | sql/sql_delete.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 5156e740028..dab9b546b2c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -941,7 +941,6 @@ public: 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: diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 92ddff58dd5..0a4c54ecdd7 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -977,7 +977,9 @@ trunc_by_del: 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); |