diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-28 12:27:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-28 12:39:50 +0200 |
| commit | d0116e10a5da52503a89a413e481996ce3f65e63 (patch) | |
| tree | e67bbdfa81ee11b205610c3b038e864f3206a0a6 /sql/sql_plugin_services.ic | |
| parent | 81d71ee6b21870772c336bff15b71904914f146a (diff) | |
| download | mariadb-git-d0116e10a5da52503a89a413e481996ce3f65e63.tar.gz | |
Revert MDEV-18464 and MDEV-12009
This reverts commit 21b2fada7ab7f35c898c02d2f918461409cc9c8e
and commit 81d71ee6b21870772c336bff15b71904914f146a.
The MDEV-18464 change introduces a few data race issues. Contrary to
the documentation, the field trx_t::victim is not always being protected
by lock_sys_t::mutex and trx_t::mutex. Most importantly, it seems
that KILL QUERY could wrongly avoid acquiring both mutexes when
invoking lock_trx_handle_wait_low(), in case another thread had
already set trx->victim=true.
We also revert MDEV-12009, because it should depend on the MDEV-18464
fix being present.
Diffstat (limited to 'sql/sql_plugin_services.ic')
| -rw-r--r-- | sql/sql_plugin_services.ic | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_plugin_services.ic b/sql/sql_plugin_services.ic index d70c76701fd..427d8937c57 100644 --- a/sql/sql_plugin_services.ic +++ b/sql/sql_plugin_services.ic @@ -181,8 +181,7 @@ static struct wsrep_service_st wsrep_handler = { wsrep_trx_is_aborting, wsrep_trx_order_before, wsrep_unlock_rollback, - wsrep_set_data_home_dir, - wsrep_thd_is_applier, + wsrep_set_data_home_dir }; static struct thd_specifics_service_st thd_specifics_handler= |