diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-04-21 13:22:08 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-08 17:43:57 -0400 |
| commit | e69fbd4e38d36853b7e72a9d6a3afe7210874436 (patch) | |
| tree | 0ac55db490d05c516d15ece4bea397e0a730a4ec | |
| parent | 3331d4e07efca993b3f34fa06b8a03b41b6b690d (diff) | |
| download | mariadb-git-e69fbd4e38d36853b7e72a9d6a3afe7210874436.tar.gz | |
Post-merge fix
| -rw-r--r-- | sql/log.cc | 10 | ||||
| -rw-r--r-- | sql/wsrep_hton.cc | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 8ea84ac189d..f042b1ab756 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -569,7 +569,15 @@ 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(false, true); + if (!cache_mngr->stmt_cache.empty()) + { + WSREP_DEBUG("pending events in stmt cache, sql: %s", thd->query()); + cache_mngr->stmt_cache.reset(); + } + } } thd->clear_binlog_table_maps(); } diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 144196aab2e..03bf072edcc 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -99,6 +99,14 @@ void wsrep_register_hton(THD* thd, bool all) */ void wsrep_post_commit(THD* thd, bool all) { + /* + TODO: It can perhaps be fixed in a more elegant fashion by turning off + wsrep_emulate_binlog if wsrep_on=0 on server start. + https://github.com/codership/mysql-wsrep/issues/112 + */ + if (!WSREP_ON) + return; + switch (thd->wsrep_exec_mode) { case LOCAL_COMMIT: |