diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
| commit | ebfa24b1d24377a241b79883da96969a9150f22c (patch) | |
| tree | ef1198f9dfb1838cbdbc5056f2b84e399b446bfd /sql/wsrep_hton.cc | |
| parent | 1fd2e10736d6fd198e62054cb9006a3dc13fd55e (diff) | |
| parent | a7123f507598690ef0fce68b5d8dc58e63635024 (diff) | |
| download | mariadb-git-ebfa24b1d24377a241b79883da96969a9150f22c.tar.gz | |
References lp:1034621 - Merge up to mysql-5.5.25 level
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 49b3ea5c0bf..219e0e8a244 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -216,7 +216,7 @@ wsrep_run_wsrep_commit( if (thd->wsrep_exec_mode != LOCAL_STATE) { DBUG_RETURN(WSREP_TRX_OK); } - if (thd->wsrep_consistency_check) { + if (thd->wsrep_consistency_check == CONSISTENCY_CHECK_RUNNING) { WSREP_DEBUG("commit for consistency check: %s", thd->query()); DBUG_RETURN(WSREP_TRX_OK); } |