diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
| commit | 4a5d25c338a5d1d2cc16343380193d6bf25ae6ae (patch) | |
| tree | 73b84a9c8f3d5e3e3383fa79465b11f9ded512d3 /sql/wsrep_applier.cc | |
| parent | 48dc7cc66ef5b69fcf28ec0b2ecf0338c188cf4e (diff) | |
| parent | c13b5011629b5ff7b969d648265002e4d1ba94c2 (diff) | |
| download | mariadb-git-4a5d25c338a5d1d2cc16343380193d6bf25ae6ae.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 059aabe7b46..cef59513485 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -72,6 +72,9 @@ Format_description_log_event* wsrep_get_apply_format(THD* thd) { return (Format_description_log_event*) thd->wsrep_apply_format; } + + DBUG_ASSERT(thd->wsrep_rgi); + return thd->wsrep_rgi->rli->relay_log.description_event_for_exec; } @@ -361,8 +364,10 @@ wsrep_cb_status_t wsrep_commit_cb(void* const ctx, else rcode = wsrep_rollback(thd); + /* Cleanup */ wsrep_set_apply_format(thd, NULL); thd->mdl_context.release_transactional_locks(); + thd->reset_query(); /* Mutex protected */ free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC)); thd->tx_isolation= (enum_tx_isolation) thd->variables.tx_isolation; |