diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-07 15:25:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-07 15:25:27 +0200 |
| commit | db947b75997248ca4b0a6b6600df993bf84cd601 (patch) | |
| tree | b6c16037931b17f645d4b71b0db8c4ebf3479435 /sql/wsrep_hton.cc | |
| parent | f95d26b4d3ec0e4b039e80439f85e4f22bd79fe7 (diff) | |
| parent | 2482306861ca107adfb6c8823cd9f6e413912ebe (diff) | |
| download | mariadb-git-db947b75997248ca4b0a6b6600df993bf84cd601.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index e5c754a9d41..a935f8c69b8 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -24,6 +24,8 @@ #include <cstdlib> #include "debug_sync.h" +extern handlerton *binlog_hton; +extern int binlog_close_connection(handlerton *hton, THD *thd); extern ulonglong thd_to_trx_id(THD *thd); extern "C" int thd_binlog_format(const MYSQL_THD thd); @@ -171,7 +173,10 @@ wsrep_close_connection(handlerton* hton, THD* thd) { DBUG_RETURN(0); } - DBUG_RETURN(wsrep_binlog_close_connection (thd)); + + if (wsrep_emulate_bin_log && thd_get_ha_data(thd, binlog_hton) != NULL) + binlog_hton->close_connection (binlog_hton, thd); + DBUG_RETURN(0); } /* @@ -262,7 +267,7 @@ static int wsrep_rollback(handlerton *hton, THD *thd, bool all) } if ((all || !thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) && - (thd->variables.wsrep_on && thd->wsrep_conflict_state != MUST_REPLAY)) + thd->variables.wsrep_on && thd->wsrep_conflict_state != MUST_REPLAY) { if (wsrep && wsrep->post_rollback(wsrep, &thd->wsrep_ws_handle)) { |