database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexey Kopytov
2010-01-24 00:09:23 +03:00
parent 83f7a74bd4 4a10f7b46c
commit 4a1b59b7ab
61 changed files with 3460 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/log.cc
View File

@@ -4306,12 +4306,20 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info)
#if defined(USING_TRANSACTIONS)
/*
Should we write to the binlog cache or to the binlog on disk?
Write to the binlog cache if:
- it is already not empty (meaning we're in a transaction; note that the
present event could be about a non-transactional table, but still we need
to write to the binlog cache in that case to handle updates to mixed
trans/non-trans table types the best possible in binlogging)
- or if the event asks for it (cache_stmt == TRUE).
1 - a transactional engine/table is updated (stmt_has_updated_trans_table == TRUE);
2 - or the event asks for it (cache_stmt == TRUE);
3 - or the cache is already not empty (meaning we're in a transaction;
note that the present event could be about a non-transactional table, but
still we need to write to the binlog cache in that case to handle updates
to mixed trans/non-trans table types).
Write to the binlog on disk if only a non-transactional engine is
updated and:
1 - the binlog cache is empty or;
2 - --binlog-direct-non-transactional-updates is set and we are about to
use the statement format. When using the row format (cache_stmt == TRUE).
*/
if (opt_using_transactions && thd)
{
@@ -4322,8 +4330,9 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info)
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
IO_CACHE *trans_log= &trx_data->trans_log;
my_off_t trans_log_pos= my_b_tell(trans_log);
if (event_info->get_cache_stmt() || trans_log_pos != 0 ||
stmt_has_updated_trans_table(thd))
if (event_info->get_cache_stmt() || stmt_has_updated_trans_table(thd) ||
(!thd->variables.binlog_direct_non_trans_update &&
trans_log_pos != 0))
{
DBUG_PRINT("info", ("Using trans_log: cache: %d, trans_log_pos: %lu",
event_info->get_cache_stmt(),