diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-02-05 19:20:47 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-02-05 19:20:47 +0200 |
| commit | d5dc568f9be19c5b3f0d003ec6a71a610fd32212 (patch) | |
| tree | aa1984419ada87d5d4dc079269f29c04ef88767b /sql/wsrep_hton.cc | |
| parent | 800fa186e3ab77ee93e75e929fe7917983e607e9 (diff) | |
| download | mariadb-git-d5dc568f9be19c5b3f0d003ec6a71a610fd32212.tar.gz | |
fixes for the merge with codership-mysql, revision 3839
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 0d5a9fde7ca..0e013556f45 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -240,7 +240,7 @@ wsrep_run_wsrep_commit( while (wsrep_replaying > 0 && thd->wsrep_conflict_state == NO_CONFLICT && - thd->killed == THD::NOT_KILLED && + thd->killed == NOT_KILLED && !shutdown_in_progress) { |