diff options
| author | Leandro Pacheco <leandro.pacheco@galeracluster.com> | 2019-09-17 04:58:20 -0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-09-17 10:58:20 +0300 |
| commit | efefafd02f72b3d56f82a29a9fa4a100932d55c0 (patch) | |
| tree | f2065ebba0b278301f684955beab11436df54b95 /sql/wsrep_high_priority_service.cc | |
| parent | c793f07841afa5c24ffdbd476a5453d03a65eac0 (diff) | |
| download | mariadb-git-efefafd02f72b3d56f82a29a9fa4a100932d55c0.tar.gz | |
fix for thread getting stuck after BF ABORT (#1362)
- Fixes a situation in which a thread gets BF aborted and does not send the reply back to
the client, even though the connection is still alive. That caused
both sides to hang waiting for the next message. Now we explicitly
check that the connection is still alive.
- MTR test for the above
- Replaced thd->killed assignments to thd->reset_kill_query where applicable.
Diffstat (limited to 'sql/wsrep_high_priority_service.cc')
| -rw-r--r-- | sql/wsrep_high_priority_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc index 73cdbd1c217..3077985250d 100644 --- a/sql/wsrep_high_priority_service.cc +++ b/sql/wsrep_high_priority_service.cc @@ -598,7 +598,7 @@ Wsrep_replayer_service::~Wsrep_replayer_service() if (m_replay_status == wsrep::provider::success) { DBUG_ASSERT(replayer_thd->wsrep_cs().current_error() == wsrep::e_success); - orig_thd->killed= NOT_KILLED; + orig_thd->reset_kill_query(); my_ok(orig_thd, m_da_shadow.affected_rows, m_da_shadow.last_insert_id); } else if (m_replay_status == wsrep::provider::error_certification_failed) |