diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-25 14:42:15 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-25 14:42:15 -0400 |
| commit | 3088d52c20eca10e5b8689648edef8f7fd49830a (patch) | |
| tree | fc75c000b47e753c04cb2c74e48d8b74d22a509f /sql/log.cc | |
| parent | 3c0b3babd9fdaa6d6697289368022cc152c77593 (diff) | |
| download | mariadb-git-3088d52c20eca10e5b8689648edef8f7fd49830a.tar.gz | |
bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index c0b3f36ee78..a46c85e503b 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -567,8 +567,11 @@ void thd_binlog_trx_reset(THD * thd) { binlog_cache_mngr *const cache_mngr= (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton); - if (cache_mngr) cache_mngr->reset(false, true); - } + if (cache_mngr) + { + cache_mngr->reset_cache(&cache_mngr->stmt_cache); + cache_mngr->reset_cache(&cache_mngr->trx_cache); + } thd->clear_binlog_table_maps(); } |