diff options
| author | unknown <ingo@chilla.local> | 2006-06-09 18:20:10 +0200 |
|---|---|---|
| committer | unknown <ingo@chilla.local> | 2006-06-09 18:20:10 +0200 |
| commit | 761c75f36f91e11a10a875066fe08835723aa095 (patch) | |
| tree | 81632ff8049a49489de01b39b1c9ecde42b04ed2 | |
| parent | 0e0755eabf605eb4ceb7e79ccc0cd72a7f664d79 (diff) | |
| parent | 0ad73944194f0f49ad0064f0d697f85bc9c7f063 (diff) | |
| download | mariadb-git-761c75f36f91e11a10a875066fe08835723aa095.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.1--main
into mysql.com:/home/mydev/mysql-5.1-amerge
| -rw-r--r-- | mysql-test/extra/binlog_tests/innodb_stat.test | 2 | ||||
| -rw-r--r-- | sql/log.cc | 6 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/extra/binlog_tests/innodb_stat.test b/mysql-test/extra/binlog_tests/innodb_stat.test index 131c244d8fd..4638dfcd2f7 100644 --- a/mysql-test/extra/binlog_tests/innodb_stat.test +++ b/mysql-test/extra/binlog_tests/innodb_stat.test @@ -1,3 +1,5 @@ +# Embedded server doesn't support binlog +-- source include/not_embedded.inc -- source include/have_innodb.inc # diff --git a/sql/log.cc b/sql/log.cc index 24d26662176..5a17ef817d0 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2852,7 +2852,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: @@ -2864,10 +2864,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]; @@ -2891,7 +2889,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())); /* diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 91b71edea66..0dae2b8f37b 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2778,7 +2778,9 @@ void select_create::binlog_show_create_table(TABLE **tables, uint count) schema that will do a close_thread_tables(), destroying the statement transaction cache. */ +#ifdef HAVE_ROW_BASED_REPLICATION DBUG_ASSERT(thd->current_stmt_binlog_row_based); +#endif DBUG_ASSERT(tables && *tables && count > 0); char buf[2048]; |