mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Auto-merge from mysql-5.5.

Browse source
This commit is contained in:
Alexander Nozdrin 2010-08-30 12:36:02 +04:00
commit 9ab0759ea4
393 changed files with 23194 additions and 6188 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/log.cc
View file

@ -4272,7 +4272,7 @@ bool use_trans_cache(const THD* thd, bool is_transactional)
(binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton);
return
((thd->variables.binlog_format != BINLOG_FORMAT_STMT ||
((thd->is_current_stmt_binlog_format_row() ||
thd->variables.binlog_direct_non_trans_update) ? is_transactional :
(is_transactional || !cache_mngr->trx_cache.empty()));
}