Commit bd1d3ebb authored by unknown's avatar unknown

bug #19650 (Embedded crashes in 5.1.10)


mysql-test/extra/binlog_tests/innodb_stat.test:
  test doesn't work with the embedded server
sql/log.cc:
  code shouldn't work without row based replication
sql/sql_insert.cc:
  code shouldn't work without row based replication
parent 4cf24a51
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
# #
......
...@@ -2877,7 +2877,7 @@ bool MYSQL_LOG::write(Log_event *event_info) ...@@ -2877,7 +2877,7 @@ bool MYSQL_LOG::write(Log_event *event_info)
} }
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#ifdef USING_TRANSACTIONS #if defined(USING_TRANSACTIONS) && defined(HAVE_ROW_BASED_REPLICATION)
/* /*
Should we write to the binlog cache or to the binlog on disk? Should we write to the binlog cache or to the binlog on disk?
Write to the binlog cache if: Write to the binlog cache if:
...@@ -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];
...@@ -2916,7 +2914,7 @@ bool MYSQL_LOG::write(Log_event *event_info) ...@@ -2916,7 +2914,7 @@ bool MYSQL_LOG::write(Log_event *event_info)
LOCK_log. LOCK_log.
*/ */
} }
#endif #endif /* USING_TRANSACTIONS && HAVE_ROW_BASED_REPLICATION */
DBUG_PRINT("info",("event type: %d",event_info->get_type_code())); DBUG_PRINT("info",("event type: %d",event_info->get_type_code()));
/* /*
......
...@@ -2759,7 +2759,9 @@ select_create::binlog_show_create_table(TABLE **tables, uint count) ...@@ -2759,7 +2759,9 @@ select_create::binlog_show_create_table(TABLE **tables, uint count)
on rollback, we clear the OPTION_STATUS_NO_TRANS_UPDATE bit of on rollback, we clear the OPTION_STATUS_NO_TRANS_UPDATE bit of
thd->options. thd->options.
*/ */
#ifdef HAVE_ROW_BASED_REPLICATION
DBUG_ASSERT(thd->current_stmt_binlog_row_based); DBUG_ASSERT(thd->current_stmt_binlog_row_based);
#endif
DBUG_ASSERT(tables && *tables && count > 0); DBUG_ASSERT(tables && *tables && count > 0);
thd->options&= ~OPTION_STATUS_NO_TRANS_UPDATE; thd->options&= ~OPTION_STATUS_NO_TRANS_UPDATE;
......
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