Commit 162e4e75 authored by mats@mysql.com's avatar mats@mysql.com

Bug#16837 (Missing #ifdef cause compile problem --without-row-based-replication):

Post-merge fixes.
parent 321db8e3
...@@ -2889,10 +2889,8 @@ bool MYSQL_LOG::write(Log_event *event_info) ...@@ -2889,10 +2889,8 @@ bool MYSQL_LOG::write(Log_event *event_info)
*/ */
if (opt_using_transactions && thd) if (opt_using_transactions && thd)
{ {
#ifdef HAVE_ROW_BASED_REPLICATION
if (thd->binlog_setup_trx_data()) if (thd->binlog_setup_trx_data())
goto err; goto err;
#endif /*HAVE_ROW_BASED_REPLICATION*/
binlog_trx_data *const trx_data= binlog_trx_data *const trx_data=
(binlog_trx_data*) thd->ha_data[binlog_hton.slot]; (binlog_trx_data*) thd->ha_data[binlog_hton.slot];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment