database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

bug #19650 (Embedded crashes in 5.1.10)

Browse Source 
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
This commit is contained in:
unknown
2006-05-24 13:28:24 +05:00
parent 4cf24a5160
commit bd1d3ebbd6
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/binlog_tests/innodb_stat.test
View File

@ -1,3 +1,5 @@
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
-- source include/have_innodb.inc
#

6
sql/log.cc
View File

@ -2877,7 +2877,7 @@ bool MYSQL_LOG::write(Log_event *event_info)
}
#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?
Write to the binlog cache if:
@ -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];
@ -2916,7 +2914,7 @@ bool MYSQL_LOG::write(Log_event *event_info)
LOCK_log.
*/
}
#endif
#endif /* USING_TRANSACTIONS && HAVE_ROW_BASED_REPLICATION */
DBUG_PRINT("info",("event type: %d",event_info->get_type_code()));
/*

2
sql/sql_insert.cc
View File

@ -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
thd->options.
*/
#ifdef HAVE_ROW_BASED_REPLICATION
DBUG_ASSERT(thd->current_stmt_binlog_row_based);
#endif
DBUG_ASSERT(tables && *tables && count > 0);
thd->options&= ~OPTION_STATUS_NO_TRANS_UPDATE;