diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-07 17:39:01 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-07 17:39:01 +0000 |
| commit | d866afe56f670d5739112fee01c122584ff60145 (patch) | |
| tree | 10a62487f399014ad77654fbf666cf1a6bf8f5ac /sql/log.cc | |
| parent | 6f7929b1432441ce90180b6b578aa4e06b84224c (diff) | |
| parent | 28286c74945e4fc4b00dcea2fcdc199e786d3a1b (diff) | |
| download | mariadb-git-d866afe56f670d5739112fee01c122584ff60145.tar.gz | |
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 15941cee376..c517803b662 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -6191,7 +6191,8 @@ int TC_LOG_BINLOG::log_xid(THD *thd, my_xid xid) We always commit the entire transaction when writing an XID. Also note that the return value is inverted. */ - DBUG_RETURN(!binlog_flush_trx_cache(thd, cache_mngr, &xle)); + DBUG_RETURN(!binlog_flush_stmt_cache(thd, cache_mngr) && + !binlog_flush_trx_cache(thd, cache_mngr, &xle)); } void TC_LOG_BINLOG::unlog(ulong cookie, my_xid xid) |