database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
holyfoot@mysql.com
2006-06-09 19:09:42 +05:00
parent 7987ef89fd 3dccb43096
commit c2df72d6cb
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/log.cc
View File

@@ -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()));
/*