diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-22 10:32:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-22 10:32:33 +0100 |
| commit | 7697bf0bd7e5b50c1071742ac90539be71f6eabe (patch) | |
| tree | 9c4f650d6961467da0bbda23e3697571c984832d /sql/sql_plugin_services.ic | |
| parent | 0686c34d22a5cbf93015012eaf77a4a977b63afb (diff) | |
| parent | 080da551ea171f8a43633ab27b56875938643dd0 (diff) | |
| download | mariadb-git-7697bf0bd7e5b50c1071742ac90539be71f6eabe.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Note: some tests fail, just as they failed before the merge!
Diffstat (limited to 'sql/sql_plugin_services.ic')
| -rw-r--r-- | sql/sql_plugin_services.ic | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_plugin_services.ic b/sql/sql_plugin_services.ic index 0570e2fcdd9..da0cc17250b 100644 --- a/sql/sql_plugin_services.ic +++ b/sql/sql_plugin_services.ic @@ -133,6 +133,7 @@ static struct wsrep_service_st wsrep_handler = { wsrep_thd_query_state_str, wsrep_thd_retry_counter, wsrep_thd_set_conflict_state, + wsrep_thd_skip_append_keys, wsrep_thd_trx_seqno, wsrep_thd_ws_handle, wsrep_trx_is_aborting, |