From 540b158f150dd19ec21c2f36d0794c70b35ea62d Mon Sep 17 00:00:00 2001
From: unknown <mats@mysql.com>
Date: Thu, 1 Jun 2006 11:20:49 +0200
Subject: [PATCH] Bug#16837 (Missing #ifdef cause compile problem
 --without-row-based-replication): Post-merge fixes.

sql/log.cc:
  Need to set up binlog_trx_data regardless of whether row-based is
  enabled or not.
---
 sql/log.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/log.cc b/sql/log.cc
index aabed8fa246..41327b85d7e 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2889,10 +2889,8 @@ bool MYSQL_LOG::write(Log_event *event_info)
     */
     if (opt_using_transactions && thd)
     {
-#ifdef HAVE_ROW_BASED_REPLICATION
       if (thd->binlog_setup_trx_data())
         goto err;
-#endif /*HAVE_ROW_BASED_REPLICATION*/
 
       binlog_trx_data *const trx_data=
         (binlog_trx_data*) thd->ha_data[binlog_hton.slot];