diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-26 22:09:14 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-26 22:09:14 +0200 |
| commit | 6422d276fa8d1217aa68be1d90c712efa4d71409 (patch) | |
| tree | 67bc00215ac0bea9b6c14e51a0018a9d7f0cd886 /sql/log.cc | |
| parent | 4a11e84414292e852a0968ef871dc90cbd24ae30 (diff) | |
| download | mariadb-git-6422d276fa8d1217aa68be1d90c712efa4d71409.tar.gz | |
bzr merge -r3895..3903 lp:codership-mysql/5.5
This is just before 5.5.34 merge in wsrep-5.5 branch
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sql/log.cc b/sql/log.cc index 6dd4aa7038b..d5cafb7de0a 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -548,20 +548,9 @@ IO_CACHE * get_trans_log(THD * thd) bool wsrep_trans_cache_is_empty(THD *thd) { - bool res= TRUE; - - if (thd_sql_command((const THD*) thd) != SQLCOM_SELECT) - res= FALSE; - else - { - binlog_cache_mngr *const cache_mngr= + binlog_cache_mngr *const cache_mngr= (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton); - if (cache_mngr) - { - res= cache_mngr->trx_cache.empty(); - } - } - return res; + return (!cache_mngr || cache_mngr->trx_cache.empty()); } void thd_binlog_flush_pending_rows_event(THD *thd, bool stmt_end) |