diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-16 14:56:59 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-16 14:56:59 +0100 |
| commit | e0072fadcb00edae74e748aee3148075b9cddae2 (patch) | |
| tree | 625d5c0869cfbb322a2b4cdaab453e17fd5d31bf /sql/sql_plugin_services.ic | |
| parent | 1146e98b3af3e2b15df0598a860f4571663a98d0 (diff) | |
| parent | ae7989ca2059869f81c837509e5ff554f7f63562 (diff) | |
| download | mariadb-git-10.6-halfmerge.tar.gz | |
Merge branch 'bb-10.5-release' into bb-10.6-release10.6-halfmerge
Diffstat (limited to 'sql/sql_plugin_services.ic')
| -rw-r--r-- | sql/sql_plugin_services.ic | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_plugin_services.ic b/sql/sql_plugin_services.ic index 0911170fb74..25fa4b3afd1 100644 --- a/sql/sql_plugin_services.ic +++ b/sql/sql_plugin_services.ic @@ -179,7 +179,9 @@ static struct wsrep_service_st wsrep_handler = { wsrep_thd_has_ignored_error, wsrep_thd_set_ignored_error, wsrep_thd_set_wsrep_aborter, - wsrep_report_bf_lock_wait + wsrep_report_bf_lock_wait, + wsrep_thd_kill_LOCK, + wsrep_thd_kill_UNLOCK }; static struct thd_specifics_service_st thd_specifics_handler= @@ -255,4 +257,3 @@ static struct st_service_ref list_of_services[]= { "json_service", VERSION_json, &json_handler }, { "thd_mdl_service", VERSION_thd_mdl, &thd_mdl_handler } }; - |