diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-10-23 22:38:11 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-10-23 22:38:11 +0300 |
| commit | ef6f9a8250804efb047ad6f28e476c59d7223e85 (patch) | |
| tree | 4dca03b7badc2e826110921392fb351fd07e80a3 /sql/wsrep_hton.cc | |
| parent | 20df56c1002e809daa68fa7431a9dd7e3d899642 (diff) | |
| download | mariadb-git-ef6f9a8250804efb047ad6f28e476c59d7223e85.tar.gz | |
References lp:1066784
merged with patch: bzr diff lp:codership-mysql/5.5 -r3795..3809
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 219e0e8a244..1fc2372a57c 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -378,6 +378,15 @@ wsrep_run_wsrep_commit( if (thd->wsrep_conflict_state == MUST_ABORT) { thd->wsrep_conflict_state= ABORTED; + } + else + { + WSREP_DEBUG("conflict state: %d", thd->wsrep_conflict_state); + if (thd->wsrep_conflict_state == NO_CONFLICT) + { + thd->wsrep_conflict_state = CERT_FAILURE; + WSREP_LOG_CONFLICT(NULL, thd, FALSE); + } } mysql_mutex_unlock(&thd->LOCK_wsrep_thd); |