diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 19:28:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 19:28:51 +0300 |
| commit | 65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5 (patch) | |
| tree | f145a7a095011fbc4e6661e1675f72f6cdca38b6 /sql/sql_parse.cc | |
| parent | eedd6179c1e5e8651270b353a693887179ad7bf3 (diff) | |
| parent | ed4ccf34a6603bd2374a721a7e1ad88472f335fc (diff) | |
| download | mariadb-git-65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5.tar.gz | |
Merge 10.2 to 10.3
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 3e1844a7f4a..9bd2e6040f0 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6072,7 +6072,7 @@ finish: 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)) |