database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-20335: Extra trans_commit_stmt after rollback caused by incorrect fix of MDEV-14401

Browse Source 
Fix incorrect else that should have been else if.
This commit is contained in:
Jan Lindström
2019-08-13 12:30:36 +03:00
parent 15c1ab52a9
commit eff898f2a0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -5487,7 +5487,7 @@ finish:
if (thd->is_error() || (thd->variables.option_bits & OPTION_MASTER_SQL_ERROR))
trans_rollback_stmt(thd);
#ifdef WITH_WSREP
if (thd->spcont &&
else if (thd->spcont &&
(thd->wsrep_conflict_state == MUST_ABORT ||
thd->wsrep_conflict_state == ABORTED ||
thd->wsrep_conflict_state == CERT_FAILURE))