diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-24 10:21:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-24 10:21:26 +0300 |
| commit | 6ce0a6f9ad77e7934e27db1b73d6d98064352928 (patch) | |
| tree | 351d7da0892c9a78310ffc39754c3ec4b38a188e /sql/sql_plugin_services.ic | |
| parent | b5c050563b1bfa1155b3b6a3b7c0c59775e77f13 (diff) | |
| parent | 882ce206dbf06b771ffe4cbce2e3e4214982f302 (diff) | |
| download | mariadb-git-6ce0a6f9ad77e7934e27db1b73d6d98064352928.tar.gz | |
Merge 10.5 into 10.6
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 e4f9f3c0d13..0911170fb74 100644 --- a/sql/sql_plugin_services.ic +++ b/sql/sql_plugin_services.ic @@ -1,5 +1,5 @@ /* Copyright (c) 2009, 2010, Oracle and/or its affiliates. - Copyright (c) 2012, 2019, MariaDB Corporation. + Copyright (c) 2012, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -178,7 +178,8 @@ static struct wsrep_service_st wsrep_handler = { wsrep_OSU_method_get, wsrep_thd_has_ignored_error, wsrep_thd_set_ignored_error, - wsrep_thd_set_wsrep_aborter + wsrep_thd_set_wsrep_aborter, + wsrep_report_bf_lock_wait }; static struct thd_specifics_service_st thd_specifics_handler= |