mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed use of uninitialized value in wsrep_TOI_end()

Browse source 
The if/else was a remnant from error voting code which was not
included in the release.
This commit is contained in:
Teemu Ollakka 2019-02-11 10:10:55 +02:00
parent 3c305d3f19
commit f0513de525
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sql/wsrep_mysqld.cc
View file

@ -1884,7 +1884,6 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
}
static void wsrep_TOI_end(THD *thd) {
int ret;
wsrep_to_isolation--;
wsrep::client_state& client_state(thd->wsrep_cs());
DBUG_ASSERT(wsrep_thd_is_local_toi(thd));
@ -1894,18 +1893,8 @@ static void wsrep_TOI_end(THD *thd) {
if (wsrep_thd_is_local_toi(thd))
{
wsrep_set_SE_checkpoint(client_state.toi_meta().gtid());
if (thd->is_error() && !wsrep_must_ignore_error(thd))
{
wsrep_apply_error err;
err.store(thd);
client_state.leave_toi();
}
else
{
ret= client_state.leave_toi();
}
if (ret == 0)
int ret= client_state.leave_toi();
if (!ret)
{
WSREP_DEBUG("TO END: %lld", client_state.toi_meta().seqno().get());
}