diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 13:33:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 13:33:23 +0300 |
| commit | ed4ccf34a6603bd2374a721a7e1ad88472f335fc (patch) | |
| tree | 26abd44f194cba3ae94736c97f4e4999f1418f3c | |
| parent | f13471c9fefc17e0f097af32e5ee8767d206d693 (diff) | |
| parent | c738aa240e5bea8292e099affd988a6f95268e12 (diff) | |
| download | mariadb-git-ed4ccf34a6603bd2374a721a7e1ad88472f335fc.tar.gz | |
Merge 10.1 into 10.2
| -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 bc3cd4c2bfd..461c4a419be 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6018,7 +6018,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)) |