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

merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge

Browse Source
This commit is contained in:
Alfranio Correia
2010-01-07 17:39:01 +00:00
parent 5dcb0e447f a533cec71b
commit 4b67a11d2b
15 changed files with 554 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/log.cc
View File

@@ -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)