1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä 2019-08-13 13:33:23 +03:00
commit ed4ccf34a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

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