Skip to content

Commit f0513de

Browse files
committed
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.
1 parent 3c305d3 commit f0513de

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

sql/wsrep_mysqld.cc

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,6 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
18841884
}
18851885

18861886
static void wsrep_TOI_end(THD *thd) {
1887-
int ret;
18881887
wsrep_to_isolation--;
18891888
wsrep::client_state& client_state(thd->wsrep_cs());
18901889
DBUG_ASSERT(wsrep_thd_is_local_toi(thd));
@@ -1894,18 +1893,8 @@ static void wsrep_TOI_end(THD *thd) {
18941893
if (wsrep_thd_is_local_toi(thd))
18951894
{
18961895
wsrep_set_SE_checkpoint(client_state.toi_meta().gtid());
1897-
if (thd->is_error() && !wsrep_must_ignore_error(thd))
1898-
{
1899-
wsrep_apply_error err;
1900-
err.store(thd);
1901-
client_state.leave_toi();
1902-
}
1903-
else
1904-
{
1905-
ret= client_state.leave_toi();
1906-
}
1907-
1908-
if (ret == 0)
1896+
int ret= client_state.leave_toi();
1897+
if (!ret)
19091898
{
19101899
WSREP_DEBUG("TO END: %lld", client_state.toi_meta().seqno().get());
19111900
}

0 commit comments

Comments
 (0)