Commit f0513de5 authored by Teemu Ollakka's avatar Teemu Ollakka

Fixed use of uninitialized value in wsrep_TOI_end()

The if/else was a remnant from error voting code which was not
included in the release.
parent 3c305d3f
...@@ -1884,7 +1884,6 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table, ...@@ -1884,7 +1884,6 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
} }
static void wsrep_TOI_end(THD *thd) { static void wsrep_TOI_end(THD *thd) {
int ret;
wsrep_to_isolation--; wsrep_to_isolation--;
wsrep::client_state& client_state(thd->wsrep_cs()); wsrep::client_state& client_state(thd->wsrep_cs());
DBUG_ASSERT(wsrep_thd_is_local_toi(thd)); DBUG_ASSERT(wsrep_thd_is_local_toi(thd));
...@@ -1894,18 +1893,8 @@ static void wsrep_TOI_end(THD *thd) { ...@@ -1894,18 +1893,8 @@ static void wsrep_TOI_end(THD *thd) {
if (wsrep_thd_is_local_toi(thd)) if (wsrep_thd_is_local_toi(thd))
{ {
wsrep_set_SE_checkpoint(client_state.toi_meta().gtid()); wsrep_set_SE_checkpoint(client_state.toi_meta().gtid());
if (thd->is_error() && !wsrep_must_ignore_error(thd)) int ret= client_state.leave_toi();
{ if (!ret)
wsrep_apply_error err;
err.store(thd);
client_state.leave_toi();
}
else
{
ret= client_state.leave_toi();
}
if (ret == 0)
{ {
WSREP_DEBUG("TO END: %lld", client_state.toi_meta().seqno().get()); WSREP_DEBUG("TO END: %lld", client_state.toi_meta().seqno().get());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment