bk commit into 5.1 tree (mats:1.2164) BUG#19066

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2164 06/06/13 17:45:51 mats@stripped +2 -0
  Bug#19066 (DELETE FROM replication inconsistency for NDB):
  Post-merge fixes.

  sql/sql_delete.cc
    1.183 06/06/13 17:45:45 mats@stripped +2 -0
    Conditional inclusion of row-based code.

  sql/sql_class.h
    1.298 06/06/13 17:45:45 mats@stripped +0 -1
    Post-merge fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b19066-mysql-5.1-new

--- 1.297/sql/sql_class.h	2006-06-13 12:54:16 +02:00
+++ 1.298/sql/sql_class.h	2006-06-13 17:45:45 +02:00
@@ -941,7 +941,6 @@
   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:

--- 1.182/sql/sql_delete.cc	2006-06-01 11:53:11 +02:00
+++ 1.183/sql/sql_delete.cc	2006-06-13 17:45:45 +02:00
@@ -977,7 +977,9 @@
   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);