Merge branch '10.4' into bb-10.4-mdev16188

21 files changed, 657 insertions, 204 deletions

diff --git a/include/aria_backup.h b/include/aria_backup.h
new file mode 100644
index 00000000000..bb2d06b0acd
--- /dev/null
+++ b/include/aria_backup.h
@@ -0,0 +1,34 @@
+/* Copyright (C) 2018 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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
+
+/* Interfaces for doing backups of Aria tables */
+
+typedef struct st_aria_table_capabilities
+{
+  my_off_t header_size;
+  ulong bitmap_pages_covered;
+  uint block_size;
+  uint keypage_header;
+  my_bool checksum;
+  my_bool transactional;
+  /* This is true if the table can be copied without any locks */
+  my_bool online_backup_safe;
+} ARIA_TABLE_CAPABILITIES;
+
+int aria_get_capabilities(File kfile, ARIA_TABLE_CAPABILITIES *cap);
+int aria_read_index(File kfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
+                    uchar *buffer);
+int aria_read_data(File dfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
+                   uchar *buffer, size_t *bytes_read);
diff --git a/include/json_lib.h b/include/json_lib.h
index fed85b516d9..b6add6d13a3 100644
--- a/include/json_lib.h
+++ b/include/json_lib.h
@@ -174,11 +174,11 @@ enum json_value_types
 {
   JSON_VALUE_OBJECT=1,
   JSON_VALUE_ARRAY=2,
-  JSON_VALUE_STRING,
-  JSON_VALUE_NUMBER,
-  JSON_VALUE_TRUE,
-  JSON_VALUE_FALSE,
-  JSON_VALUE_NULL
+  JSON_VALUE_STRING=3,
+  JSON_VALUE_NUMBER=4,
+  JSON_VALUE_TRUE=5,
+  JSON_VALUE_FALSE=6,
+  JSON_VALUE_NULL=7
 };
 
 
@@ -423,10 +423,15 @@ int json_path_parts_compare(
 int json_path_compare(const json_path_t *a, const json_path_t *b,
                       enum json_value_types vt);
 
+int json_valid(const char *js, size_t js_len, CHARSET_INFO *cs);
+
+int json_locate_key(const char *js, const char *js_end,
+                    const char *kname,
+                    const char **key_start, const char **key_end,
+                    int *comma_pos);
 
 #ifdef  __cplusplus
 }
 #endif
 
 #endif /* JSON_LIB_INCLUDED */
-
diff --git a/include/lf.h b/include/lf.h
index a9d7e9ee688..fe861a524dc 100644
--- a/include/lf.h
+++ b/include/lf.h
@@ -167,6 +167,8 @@ void *lf_hash_search_using_hash_value(LF_HASH *hash, LF_PINS *pins,
 int lf_hash_delete(LF_HASH *hash, LF_PINS *pins, const void *key, uint keylen);
 int lf_hash_iterate(LF_HASH *hash, LF_PINS *pins,
                     my_hash_walk_action action, void *argument);
+#define lf_hash_size(hash) \
+  my_atomic_load32_explicit(&(hash)->count, MY_MEMORY_ORDER_RELAXED)
 /*
   shortcut macros to access underlying pinbox functions from an LF_HASH
   see lf_pinbox_get_pins() and lf_pinbox_put_pins()
diff --git a/include/my_counter.h b/include/my_counter.h
new file mode 100644
index 00000000000..c5cbe296df0
--- /dev/null
+++ b/include/my_counter.h
@@ -0,0 +1,49 @@
+#ifndef MY_COUNTER_H_INCLUDED
+#define MY_COUNTER_H_INCLUDED
+/*
+   Copyright (C) 2018 MariaDB Foundation
+
+   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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include <atomic>
+
+
+template <typename Type> class Atomic_counter
+{
+  std::atomic<Type> m_counter;
+
+  Type add(Type i) { return m_counter.fetch_add(i, std::memory_order_relaxed); }
+  Type sub(Type i) { return m_counter.fetch_sub(i, std::memory_order_relaxed); }
+
+public:
+  Atomic_counter(const Atomic_counter<Type> &rhs)
+  { m_counter.store(rhs, std::memory_order_relaxed); }
+  Atomic_counter(Type val): m_counter(val) {}
+  Atomic_counter() {}
+
+  Type operator++(int) { return add(1); }
+  Type operator--(int) { return sub(1); }
+
+  Type operator++() { return add(1) + 1; }
+  Type operator--() { return sub(1) - 1; }
+
+  Type operator+=(const Type i) { return add(i) + i; }
+  Type operator-=(const Type i) { return sub(i) - i; }
+
+  operator Type() const { return m_counter.load(std::memory_order_relaxed); }
+  Type operator=(const Type val)
+  { m_counter.store(val, std::memory_order_relaxed); return val; }
+};
+#endif /* MY_COUNTER_H_INCLUDED */
diff --git a/include/my_global.h b/include/my_global.h
index ea438e7171f..69b91f8b870 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1068,7 +1068,7 @@ typedef ulong		myf;	/* Type of MyFlags in my_funcs */
 static inline char *dlerror(void)
 {
   static char win_errormsg[2048];
-  FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+  FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM,
     0, GetLastError(), 0, win_errormsg, 2048, NULL);
   return win_errormsg;
 }
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 2712c7d8ffd..843701ccab9 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -189,7 +189,19 @@ extern int my_pthread_create_detached;
 int sigwait(sigset_t *set, int *sig);
 #endif
 
-#define my_sigwait(A,B) sigwait((A),(B))
+static inline int my_sigwait(sigset_t *set, int *sig, int *code)
+{
+#ifdef HAVE_SIGWAITINFO
+  siginfo_t siginfo;
+  *sig= sigwaitinfo(set, &siginfo);
+  *code= siginfo.si_code;
+  return *sig < 0 ?  errno : 0;
+#else
+#define SI_KERNEL 128
+  *code= 0;
+  return sigwait(set, sig);
+#endif
+}
 
 #if defined(HAVE_SIGTHREADMASK) && !defined(HAVE_PTHREAD_SIGMASK)
 #define pthread_sigmask(A,B,C) sigthreadmask((A),(B),(C))
diff --git a/include/my_time.h b/include/my_time.h
index babd6101eeb..27011be8b47 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -57,13 +57,6 @@ extern uchar days_in_month[];
 
 /* Flags to str_to_datetime */
 
-/*
-  TIME_FUZZY_DATES is used for the result will only be used for comparison
-  purposes. Conversion is as relaxed as possible.
-*/
-#define C_TIME_FUZZY_DATES      1U
-#define C_TIME_DATETIME_ONLY    2U
-#define C_TIME_TIME_ONLY        4U
 #define C_TIME_NO_ZERO_IN_DATE  (1UL << 23) /* == MODE_NO_ZERO_IN_DATE */
 #define C_TIME_NO_ZERO_DATE     (1UL << 24) /* == MODE_NO_ZERO_DATE    */
 #define C_TIME_INVALID_DATES    (1UL << 25) /* == MODE_INVALID_DATES   */
@@ -86,6 +79,16 @@ extern uchar days_in_month[];
 /* Useful constants */
 #define SECONDS_IN_24H 86400L
 
+/* Limits for the INTERVAL data type */
+
+ /* Number of hours between '0001-01-01 00h' and '9999-12-31 23h' */
+#define TIME_MAX_INTERVAL_HOUR             87649415
+#define TIME_MAX_INTERVAL_HOUR_CHAR_LENGTH 8
+
+/* Number of full days between '0001-01-01' and '9999-12-31'*/
+#define TIME_MAX_INTERVAL_DAY              3652058 /*87649415/24*/
+#define TIME_MAX_INTERVAL_DAY_CHAR_LENGTH  7
+
 /* Limits for the TIME data type */
 #define TIME_MAX_HOUR 838
 #define TIME_MAX_MINUTE 59
@@ -105,27 +108,46 @@ typedef struct st_mysql_time_status
 {
   int warnings;
   uint precision;
+  uint nanoseconds;
 } MYSQL_TIME_STATUS;
 
 static inline void my_time_status_init(MYSQL_TIME_STATUS *status)
 {
   status->warnings= 0;
   status->precision= 0;
+  status->nanoseconds= 0;
 }
 
 my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,
                    ulonglong flags, int *was_cut);
 my_bool str_to_DDhhmmssff(const char *str, size_t length, MYSQL_TIME *l_time,
                           ulong max_hour, MYSQL_TIME_STATUS *status);
-my_bool str_to_time(const char *str, size_t length, MYSQL_TIME *l_time, 
-                    ulonglong flag, MYSQL_TIME_STATUS *status);
-my_bool str_to_datetime(const char *str, size_t length, MYSQL_TIME *l_time,
-                        ulonglong flags, MYSQL_TIME_STATUS *status);
-longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
-                            ulonglong flags, int *was_cut);
-
-int number_to_time(my_bool neg, ulonglong nr, ulong sec_part,
-                   MYSQL_TIME *ltime, int *was_cut);
+my_bool str_to_datetime_or_date_or_time(const char *str, size_t length,
+                                        MYSQL_TIME *to, ulonglong flag,
+                                        MYSQL_TIME_STATUS *status,
+                                        ulong time_max_hour,
+                                        ulong time_err_hour);
+my_bool
+str_to_datetime_or_date_or_interval_hhmmssff(const char *str, size_t length,
+                                             MYSQL_TIME *to, ulonglong flag,
+                                             MYSQL_TIME_STATUS *status,
+                                             ulong time_max_hour,
+                                             ulong time_err_hour);
+my_bool
+str_to_datetime_or_date_or_interval_day(const char *str, size_t length,
+                                        MYSQL_TIME *to, ulonglong flag,
+                                        MYSQL_TIME_STATUS *status,
+                                        ulong time_max_hour,
+                                        ulong time_err_hour);
+my_bool str_to_datetime_or_date(const char *str, size_t length, MYSQL_TIME *to,
+                                ulonglong flags, MYSQL_TIME_STATUS *status);
+
+longlong number_to_datetime_or_date(longlong nr, ulong sec_part,
+                                    MYSQL_TIME *time_res,
+                                    ulonglong flags, int *was_cut);
+int number_to_time_only(my_bool neg, ulonglong nr, ulong sec_part,
+                        ulong max_hour, MYSQL_TIME *to, int *was_cut);
+
 ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *);
 ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *);
 ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *);
@@ -188,6 +210,7 @@ void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type);
 #define MAX_DATE_STRING_REP_LENGTH 30
 #define AUTO_SEC_PART_DIGITS DECIMAL_NOT_SPECIFIED
 
+int my_interval_DDhhmmssff_to_str(const MYSQL_TIME *, char *to, uint digits);
 int my_time_to_str(const MYSQL_TIME *l_time, char *to, uint digits);
 int my_date_to_str(const MYSQL_TIME *l_time, char *to);
 int my_datetime_to_str(const MYSQL_TIME *l_time, char *to, uint digits);
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index b122d888c6d..02a87c6db71 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -75,7 +75,7 @@ typedef struct st_mysql_xid MYSQL_XID;
 #define MYSQL_PLUGIN_INTERFACE_VERSION 0x0104
 
 /* MariaDB plugin interface version */
-#define MARIA_PLUGIN_INTERFACE_VERSION 0x010d
+#define MARIA_PLUGIN_INTERFACE_VERSION 0x010e
 
 /*
   The allowable types of plugins
diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp
index 89f7dcc36c4..c5ae678e82a 100644
--- a/include/mysql/plugin_audit.h.pp
+++ b/include/mysql/plugin_audit.h.pp
@@ -374,6 +374,51 @@ extern struct thd_wait_service_st {
 } *thd_wait_service;
 void thd_wait_begin(void* thd, int wait_type);
 void thd_wait_end(void* thd);
+enum json_types
+{
+  JSV_BAD_JSON=-1,
+  JSV_NOTHING=0,
+  JSV_OBJECT=1,
+  JSV_ARRAY=2,
+  JSV_STRING=3,
+  JSV_NUMBER=4,
+  JSV_TRUE=5,
+  JSV_FALSE=6,
+  JSV_NULL=7
+};
+extern struct json_service_st {
+  enum json_types (*json_type)(const char *js, const char *js_end,
+                               const char **value, int *value_len);
+  enum json_types (*json_get_array_item)(const char *js, const char *js_end,
+                                         int n_item,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_key)(const char *js, const char *js_end,
+                                         const char *key,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_nkey)(const char *js,const char *js_end,
+                             int nkey,
+                             const char **keyname, const char **keyname_end,
+                             const char **value, int *value_len);
+  int (*json_escape_string)(const char *str,const char *str_end,
+                          char *json, char *json_end);
+  int (*json_unescape_json)(const char *json_str, const char *json_end,
+                          char *res, char *res_end);
+} *json_service;
+enum json_types json_type(const char *js, const char *js_end,
+                          const char **value, int *value_len);
+enum json_types json_get_array_item(const char *js, const char *js_end,
+                                    int n_item,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_key(const char *js, const char *js_end,
+                                    const char *key,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_nkey(const char *js,const char *js_end, int nkey,
+                       const char **keyname, const char **keyname_end,
+                       const char **value, int *value_len);
+int json_escape_string(const char *str,const char *str_end,
+                       char *json, char *json_end);
+int json_unescape_json(const char *json_str, const char *json_end,
+                       char *res, char *res_end);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp
index 7ed786cc1ab..41cb7d075c4 100644
--- a/include/mysql/plugin_auth.h.pp
+++ b/include/mysql/plugin_auth.h.pp
@@ -374,6 +374,51 @@ extern struct thd_wait_service_st {
 } *thd_wait_service;
 void thd_wait_begin(void* thd, int wait_type);
 void thd_wait_end(void* thd);
+enum json_types
+{
+  JSV_BAD_JSON=-1,
+  JSV_NOTHING=0,
+  JSV_OBJECT=1,
+  JSV_ARRAY=2,
+  JSV_STRING=3,
+  JSV_NUMBER=4,
+  JSV_TRUE=5,
+  JSV_FALSE=6,
+  JSV_NULL=7
+};
+extern struct json_service_st {
+  enum json_types (*json_type)(const char *js, const char *js_end,
+                               const char **value, int *value_len);
+  enum json_types (*json_get_array_item)(const char *js, const char *js_end,
+                                         int n_item,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_key)(const char *js, const char *js_end,
+                                         const char *key,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_nkey)(const char *js,const char *js_end,
+                             int nkey,
+                             const char **keyname, const char **keyname_end,
+                             const char **value, int *value_len);
+  int (*json_escape_string)(const char *str,const char *str_end,
+                          char *json, char *json_end);
+  int (*json_unescape_json)(const char *json_str, const char *json_end,
+                          char *res, char *res_end);
+} *json_service;
+enum json_types json_type(const char *js, const char *js_end,
+                          const char **value, int *value_len);
+enum json_types json_get_array_item(const char *js, const char *js_end,
+                                    int n_item,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_key(const char *js, const char *js_end,
+                                    const char *key,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_nkey(const char *js,const char *js_end, int nkey,
+                       const char **keyname, const char **keyname_end,
+                       const char **value, int *value_len);
+int json_escape_string(const char *str,const char *str_end,
+                       char *json, char *json_end);
+int json_unescape_json(const char *json_str, const char *json_end,
+                       char *res, char *res_end);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/plugin_encryption.h.pp b/include/mysql/plugin_encryption.h.pp
index 7defe0aec2c..6597decfbef 100644
--- a/include/mysql/plugin_encryption.h.pp
+++ b/include/mysql/plugin_encryption.h.pp
@@ -374,6 +374,51 @@ extern struct thd_wait_service_st {
 } *thd_wait_service;
 void thd_wait_begin(void* thd, int wait_type);
 void thd_wait_end(void* thd);
+enum json_types
+{
+  JSV_BAD_JSON=-1,
+  JSV_NOTHING=0,
+  JSV_OBJECT=1,
+  JSV_ARRAY=2,
+  JSV_STRING=3,
+  JSV_NUMBER=4,
+  JSV_TRUE=5,
+  JSV_FALSE=6,
+  JSV_NULL=7
+};
+extern struct json_service_st {
+  enum json_types (*json_type)(const char *js, const char *js_end,
+                               const char **value, int *value_len);
+  enum json_types (*json_get_array_item)(const char *js, const char *js_end,
+                                         int n_item,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_key)(const char *js, const char *js_end,
+                                         const char *key,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_nkey)(const char *js,const char *js_end,
+                             int nkey,
+                             const char **keyname, const char **keyname_end,
+                             const char **value, int *value_len);
+  int (*json_escape_string)(const char *str,const char *str_end,
+                          char *json, char *json_end);
+  int (*json_unescape_json)(const char *json_str, const char *json_end,
+                          char *res, char *res_end);
+} *json_service;
+enum json_types json_type(const char *js, const char *js_end,
+                          const char **value, int *value_len);
+enum json_types json_get_array_item(const char *js, const char *js_end,
+                                    int n_item,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_key(const char *js, const char *js_end,
+                                    const char *key,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_nkey(const char *js,const char *js_end, int nkey,
+                       const char **keyname, const char **keyname_end,
+                       const char **value, int *value_len);
+int json_escape_string(const char *str,const char *str_end,
+                       char *json, char *json_end);
+int json_unescape_json(const char *json_str, const char *json_end,
+                       char *res, char *res_end);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp
index a36f51e74e1..bd1cfc7b68b 100644
--- a/include/mysql/plugin_ftparser.h.pp
+++ b/include/mysql/plugin_ftparser.h.pp
@@ -374,6 +374,51 @@ extern struct thd_wait_service_st {
 } *thd_wait_service;
 void thd_wait_begin(void* thd, int wait_type);
 void thd_wait_end(void* thd);
+enum json_types
+{
+  JSV_BAD_JSON=-1,
+  JSV_NOTHING=0,
+  JSV_OBJECT=1,
+  JSV_ARRAY=2,
+  JSV_STRING=3,
+  JSV_NUMBER=4,
+  JSV_TRUE=5,
+  JSV_FALSE=6,
+  JSV_NULL=7
+};
+extern struct json_service_st {
+  enum json_types (*json_type)(const char *js, const char *js_end,
+                               const char **value, int *value_len);
+  enum json_types (*json_get_array_item)(const char *js, const char *js_end,
+                                         int n_item,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_key)(const char *js, const char *js_end,
+                                         const char *key,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_nkey)(const char *js,const char *js_end,
+                             int nkey,
+                             const char **keyname, const char **keyname_end,
+                             const char **value, int *value_len);
+  int (*json_escape_string)(const char *str,const char *str_end,
+                          char *json, char *json_end);
+  int (*json_unescape_json)(const char *json_str, const char *json_end,
+                          char *res, char *res_end);
+} *json_service;
+enum json_types json_type(const char *js, const char *js_end,
+                          const char **value, int *value_len);
+enum json_types json_get_array_item(const char *js, const char *js_end,
+                                    int n_item,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_key(const char *js, const char *js_end,
+                                    const char *key,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_nkey(const char *js,const char *js_end, int nkey,
+                       const char **keyname, const char **keyname_end,
+                       const char **value, int *value_len);
+int json_escape_string(const char *str,const char *str_end,
+                       char *json, char *json_end);
+int json_unescape_json(const char *json_str, const char *json_end,
+                       char *res, char *res_end);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/plugin_password_validation.h.pp b/include/mysql/plugin_password_validation.h.pp
index b13f8cc9afb..2f9d2299c1f 100644
--- a/include/mysql/plugin_password_validation.h.pp
+++ b/include/mysql/plugin_password_validation.h.pp
@@ -374,6 +374,51 @@ extern struct thd_wait_service_st {
 } *thd_wait_service;
 void thd_wait_begin(void* thd, int wait_type);
 void thd_wait_end(void* thd);
+enum json_types
+{
+  JSV_BAD_JSON=-1,
+  JSV_NOTHING=0,
+  JSV_OBJECT=1,
+  JSV_ARRAY=2,
+  JSV_STRING=3,
+  JSV_NUMBER=4,
+  JSV_TRUE=5,
+  JSV_FALSE=6,
+  JSV_NULL=7
+};
+extern struct json_service_st {
+  enum json_types (*json_type)(const char *js, const char *js_end,
+                               const char **value, int *value_len);
+  enum json_types (*json_get_array_item)(const char *js, const char *js_end,
+                                         int n_item,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_key)(const char *js, const char *js_end,
+                                         const char *key,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_nkey)(const char *js,const char *js_end,
+                             int nkey,
+                             const char **keyname, const char **keyname_end,
+                             const char **value, int *value_len);
+  int (*json_escape_string)(const char *str,const char *str_end,
+                          char *json, char *json_end);
+  int (*json_unescape_json)(const char *json_str, const char *json_end,
+                          char *res, char *res_end);
+} *json_service;
+enum json_types json_type(const char *js, const char *js_end,
+                          const char **value, int *value_len);
+enum json_types json_get_array_item(const char *js, const char *js_end,
+                                    int n_item,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_key(const char *js, const char *js_end,
+                                    const char *key,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_nkey(const char *js,const char *js_end, int nkey,
+                       const char **keyname, const char **keyname_end,
+                       const char **value, int *value_len);
+int json_escape_string(const char *str,const char *str_end,
+                       char *json, char *json_end);
+int json_unescape_json(const char *json_str, const char *json_end,
+                       char *res, char *res_end);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/service_json.h b/include/mysql/service_json.h
new file mode 100644
index 00000000000..141b76279a5
--- /dev/null
+++ b/include/mysql/service_json.h
@@ -0,0 +1,117 @@
+/* Copyright (C) 2018 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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
+
+#ifndef MYSQL_SERVICE_JSON
+#define MYSQL_SERVICE_JSON
+
+/**
+  @file
+  json service
+
+  Esports JSON parsing methods for plugins to use.
+
+  Fuctions of the service:
+    js_type - returns the type of the JSON argument,
+       and the parsed value if it's scalar (not object or array)
+
+    js_get_array_item - expecs JSON array as an argument,
+       and returns the n_item's item's type and value
+       Returns JSV_NOTHING type if the array is shorter
+       than n_item and the actual length of the array in v_len.
+
+    js_get_object_key - expects JSON object as an argument,
+       searches for a key in the object, return it's type and value.
+       JSV_NOTHING if no such key found, the number of keys
+       in v_len.
+
+    js_get_object_nkey - expects JSON object as an argument.
+      finds n_key's key in the object, returns it's name, type and value.
+      JSV_NOTHING if object has less keys than n_key.
+*/
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum json_types
+{
+  JSV_BAD_JSON=-1,
+  JSV_NOTHING=0,
+  JSV_OBJECT=1,
+  JSV_ARRAY=2,
+  JSV_STRING=3,
+  JSV_NUMBER=4,
+  JSV_TRUE=5,
+  JSV_FALSE=6,
+  JSV_NULL=7
+};
+
+extern struct json_service_st {
+  enum json_types (*json_type)(const char *js, const char *js_end,
+                               const char **value, int *value_len);
+  enum json_types (*json_get_array_item)(const char *js, const char *js_end,
+                                         int n_item,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_key)(const char *js, const char *js_end,
+                                         const char *key,
+                                         const char **value, int *value_len);
+  enum json_types (*json_get_object_nkey)(const char *js,const char *js_end,
+                             int nkey,
+                             const char **keyname, const char **keyname_end,
+                             const char **value, int *value_len);
+  int (*json_escape_string)(const char *str,const char *str_end,
+                          char *json, char *json_end);
+  int (*json_unescape_json)(const char *json_str, const char *json_end,
+                          char *res, char *res_end);
+} *json_service;
+
+#ifdef MYSQL_DYNAMIC_PLUGIN
+
+#define json_type json_service->json_type
+#define json_get_array_item json_service->json_get_array_item
+#define json_get_object_key json_service->json_get_object_key
+#define json_get_object_nkey json_service->json_get_object_nkey
+#define json_escape_string json_service->json_escape_string
+#define json_unescape_json json_service->json_unescape_json
+
+#else
+
+enum json_types json_type(const char *js, const char *js_end,
+                          const char **value, int *value_len);
+enum json_types json_get_array_item(const char *js, const char *js_end,
+                                    int n_item,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_key(const char *js, const char *js_end,
+                                    const char *key,
+                                    const char **value, int *value_len);
+enum json_types json_get_object_nkey(const char *js,const char *js_end, int nkey,
+                       const char **keyname, const char **keyname_end,
+                       const char **value, int *value_len);
+int json_escape_string(const char *str,const char *str_end,
+                       char *json, char *json_end);
+int json_unescape_json(const char *json_str, const char *json_end,
+                       char *res, char *res_end);
+
+#endif /*MYSQL_DYNAMIC_PLUGIN*/
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*MYSQL_SERVICE_JSON */
+
+
diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h
index cefba6303fe..5aa97cdb47e 100644
--- a/include/mysql/service_wsrep.h
+++ b/include/mysql/service_wsrep.h
@@ -1,5 +1,20 @@
 #ifndef MYSQL_SERVICE_WSREP_INCLUDED
+#define MYSQL_SERVICE_WSREP_INCLUDED
+
+enum Wsrep_service_key_type
+{
+    WSREP_SERVICE_KEY_SHARED,
+    WSREP_SERVICE_KEY_REFERENCE,
+    WSREP_SERVICE_KEY_UPDATE,
+    WSREP_SERVICE_KEY_EXCLUSIVE
+};
+
+#if (defined (MYSQL_DYNAMIC_PLUGIN) && defined(MYSQL_SERVICE_WSREP_DYNAMIC_INCLUDED)) || (!defined(MYSQL_DYNAMIC_PLUGIN) && defined(MYSQL_SERVICE_WSREP_STATIC_INCLUDED))
+
+#else
+
 /* Copyright (c) 2015 MariaDB Corporation Ab
+                 2018 Codership Oy <info@codership.com>
 
    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
@@ -21,153 +36,92 @@
   Interface to WSREP functionality in the server.
   For engines that want to support galera.
 */
-
+#include <my_pthread.h>
 #ifdef __cplusplus
-extern "C" {
 #endif
 
-enum wsrep_conflict_state {
-    NO_CONFLICT,
-    MUST_ABORT,
-    ABORTING,
-    ABORTED,
-    MUST_REPLAY,
-    REPLAYING,
-    RETRY_AUTOCOMMIT,
-    CERT_FAILURE,
-};
-
-enum wsrep_exec_mode {
-    /* Transaction processing before replication. */
-    LOCAL_STATE,
-    /* Slave thread applying write sets from other nodes or replaying thread. */
-    REPL_RECV,
-    /* Total-order-isolation mode. */
-    TOTAL_ORDER,
-    /*
-      Transaction procession after it has been replicated in prepare stage and
-      has passed certification.
-    */
-    LOCAL_COMMIT
-};
-
-enum wsrep_query_state {
-    QUERY_IDLE,
-    QUERY_EXEC,
-    QUERY_COMMITTING,
-    QUERY_EXITING,
-    QUERY_ROLLINGBACK,
-};
-
-enum wsrep_trx_status {
-    WSREP_TRX_OK,
-    WSREP_TRX_CERT_FAIL,      /* certification failure, must abort */
-    WSREP_TRX_SIZE_EXCEEDED,  /* trx size exceeded */
-    WSREP_TRX_ERROR,          /* native mysql error */
-};
-
 struct xid_t;
-struct wsrep;
 struct wsrep_ws_handle;
 struct wsrep_buf;
 
+/* Must match to definition in sql/mysqld.h */
+typedef int64 query_id_t;
+
+
 extern struct wsrep_service_st {
-  struct wsrep *              (*get_wsrep_func)();
-  my_bool                     (*get_wsrep_certify_nonPK_func)();
-  my_bool                     (*get_wsrep_debug_func)();
-  my_bool                     (*get_wsrep_drupal_282555_workaround_func)();
   my_bool                     (*get_wsrep_recovery_func)();
-  my_bool                     (*get_wsrep_load_data_splitting_func)();
-  my_bool                     (*get_wsrep_log_conflicts_func)();
-  long                        (*get_wsrep_protocol_version_func)();
-  my_bool                     (*wsrep_aborting_thd_contains_func)(THD *thd);
-  void                        (*wsrep_aborting_thd_enqueue_func)(THD *thd);
-  bool                        (*wsrep_consistency_check_func)(THD *thd);
-  int                         (*wsrep_is_wsrep_xid_func)(const struct xid_t *xid);
+  bool                        (*wsrep_consistency_check_func)(MYSQL_THD thd);
+  int                         (*wsrep_is_wsrep_xid_func)(const void *xid);
   long long                   (*wsrep_xid_seqno_func)(const struct xid_t *xid);
   const unsigned char*        (*wsrep_xid_uuid_func)(const struct xid_t *xid);
-  void                        (*wsrep_lock_rollback_func)();
-  int                         (*wsrep_on_func)(MYSQL_THD);
-  void                        (*wsrep_post_commit_func)(THD* thd, bool all);
-  bool                        (*wsrep_prepare_key_func)(const unsigned char*, size_t, const unsigned char*, size_t, struct wsrep_buf*, size_t*);
-  enum wsrep_trx_status       (*wsrep_run_wsrep_commit_func)(THD *thd, bool all);
-  void                        (*wsrep_thd_LOCK_func)(THD *thd);
-  void                        (*wsrep_thd_UNLOCK_func)(THD *thd);
-  void                        (*wsrep_thd_awake_func)(THD *thd, my_bool signal);
-  enum wsrep_conflict_state   (*wsrep_thd_conflict_state_func)(MYSQL_THD, my_bool);
-  const char *                (*wsrep_thd_conflict_state_str_func)(THD *thd);
-  enum wsrep_exec_mode        (*wsrep_thd_exec_mode_func)(THD *thd);
-  const char *                (*wsrep_thd_exec_mode_str_func)(THD *thd);
-  enum wsrep_conflict_state   (*wsrep_thd_get_conflict_state_func)(MYSQL_THD);
-  my_bool                     (*wsrep_thd_is_BF_func)(MYSQL_THD , my_bool);
-  my_bool                     (*wsrep_thd_is_wsrep_func)(MYSQL_THD thd);
-  char *                      (*wsrep_thd_query_func)(THD *thd);
-  enum wsrep_query_state      (*wsrep_thd_query_state_func)(THD *thd);
-  const char *                (*wsrep_thd_query_state_str_func)(THD *thd);
-  int                         (*wsrep_thd_retry_counter_func)(THD *thd);
-  void                        (*wsrep_thd_set_conflict_state_func)(THD *thd, enum wsrep_conflict_state state);
-  bool                        (*wsrep_thd_ignore_table_func)(THD *thd);
-  long long                   (*wsrep_thd_trx_seqno_func)(THD *thd);
-  struct wsrep_ws_handle *    (*wsrep_thd_ws_handle_func)(THD *thd);
-  int                         (*wsrep_trx_is_aborting_func)(MYSQL_THD thd);
-  int                         (*wsrep_trx_order_before_func)(MYSQL_THD, MYSQL_THD);
-  void                        (*wsrep_unlock_rollback_func)();
+  my_bool                     (*wsrep_on_func)(const MYSQL_THD thd);
+  bool                        (*wsrep_prepare_key_for_innodb_func)(MYSQL_THD thd, const unsigned char*, size_t, const unsigned char*, size_t, struct wsrep_buf*, size_t*);
+  void                        (*wsrep_thd_LOCK_func)(const MYSQL_THD thd);
+  void                        (*wsrep_thd_UNLOCK_func)(const MYSQL_THD thd);
+  const char *                (*wsrep_thd_query_func)(const MYSQL_THD thd);
+  int                         (*wsrep_thd_retry_counter_func)(const MYSQL_THD thd);
+  bool                        (*wsrep_thd_ignore_table_func)(MYSQL_THD thd);
+  long long                   (*wsrep_thd_trx_seqno_func)(const MYSQL_THD thd);
+  my_bool                     (*wsrep_thd_is_aborting_func)(const MYSQL_THD thd);
   void                        (*wsrep_set_data_home_dir_func)(const char *data_dir);
+  my_bool                     (*wsrep_thd_is_BF_func)(const MYSQL_THD thd, my_bool sync);
+  my_bool                     (*wsrep_thd_is_local_func)(const MYSQL_THD thd);
+  void                        (*wsrep_thd_self_abort_func)(MYSQL_THD thd);
+  int                         (*wsrep_thd_append_key_func)(MYSQL_THD thd, const struct wsrep_key* key,
+                                                           int n_keys, enum Wsrep_service_key_type);
+  const char*                 (*wsrep_thd_client_state_str_func)(const MYSQL_THD thd);
+  const char*                 (*wsrep_thd_client_mode_str_func)(const MYSQL_THD thd);
+  const char*                 (*wsrep_thd_transaction_state_str_func)(const MYSQL_THD thd);
+  query_id_t                  (*wsrep_thd_transaction_id_func)(const MYSQL_THD thd);
+  my_bool                     (*wsrep_thd_bf_abort_func)(const MYSQL_THD bf_thd,
+                                                         MYSQL_THD victim_thd,
+                                                         my_bool signal);
+  my_bool                     (*wsrep_thd_order_before_func)(const MYSQL_THD left, const MYSQL_THD right);
+  void                        (*wsrep_handle_SR_rollback_func)(MYSQL_THD BF_thd, MYSQL_THD victim_thd);
+  my_bool                     (*wsrep_thd_skip_locking_func)(const MYSQL_THD thd);
+  const char*                 (*wsrep_get_sr_table_name_func)();
+  my_bool                     (*wsrep_get_debug_func)();
 } *wsrep_service;
 
+#define MYSQL_SERVICE_WSREP_INCLUDED
+#endif
+
 #ifdef MYSQL_DYNAMIC_PLUGIN
-#define get_wsrep() wsrep_service->get_wsrep_func()
-#define get_wsrep_certify_nonPK() wsrep_service->get_wsrep_certify_nonPK_func()
-#define get_wsrep_debug() wsrep_service->get_wsrep_debug_func()
-#define get_wsrep_drupal_282555_workaround() wsrep_service->get_wsrep_drupal_282555_workaround_func()
+
+#define MYSQL_SERVICE_WSREP_DYNAMIC_INCLUDED
 #define get_wsrep_recovery() wsrep_service->get_wsrep_recovery_func()
-#define get_wsrep_load_data_splitting() wsrep_service->get_wsrep_load_data_splitting_func()
-#define get_wsrep_log_conflicts() wsrep_service->get_wsrep_log_conflicts_func()
-#define get_wsrep_protocol_version() wsrep_service->get_wsrep_protocol_version_func()
-#define wsrep_aborting_thd_contains(T) wsrep_service->wsrep_aborting_thd_contains_func(T)
-#define wsrep_aborting_thd_enqueue(T) wsrep_service->wsrep_aborting_thd_enqueue_func(T)
 #define wsrep_consistency_check(T) wsrep_service->wsrep_consistency_check_func(T)
 #define wsrep_is_wsrep_xid(X) wsrep_service->wsrep_is_wsrep_xid_func(X)
 #define wsrep_xid_seqno(X) wsrep_service->wsrep_xid_seqno_func(X)
 #define wsrep_xid_uuid(X) wsrep_service->wsrep_xid_uuid_func(X)
-#define wsrep_lock_rollback() wsrep_service->wsrep_lock_rollback_func()
 #define wsrep_on(X) wsrep_service->wsrep_on_func(X)
-#define wsrep_post_commit(T,A) wsrep_service->wsrep_post_commit_func(T,A)
-#define wsrep_prepare_key(A,B,C,D,E,F) wsrep_service->wsrep_prepare_key_func(A,B,C,D,E,F)
-#define wsrep_run_wsrep_commit(T,A) wsrep_service->wsrep_run_wsrep_commit_func(T,A)
+#define wsrep_prepare_key_for_innodb(A,B,C,D,E,F,G) wsrep_service->wsrep_prepare_key_for_innodb_func(A,B,C,D,E,F,G)
 #define wsrep_thd_LOCK(T) wsrep_service->wsrep_thd_LOCK_func(T)
 #define wsrep_thd_UNLOCK(T) wsrep_service->wsrep_thd_UNLOCK_func(T)
-#define wsrep_thd_awake(T,S) wsrep_service->wsrep_thd_awake_func(T,S)
-#define wsrep_thd_conflict_state(T,S) wsrep_service->wsrep_thd_conflict_state_func(T,S)
-#define wsrep_thd_conflict_state_str(T) wsrep_service->wsrep_thd_conflict_state_str_func(T)
-#define wsrep_thd_exec_mode(T) wsrep_service->wsrep_thd_exec_mode_func(T)
-#define wsrep_thd_exec_mode_str(T) wsrep_service->wsrep_thd_exec_mode_str_func(T)
-#define wsrep_thd_get_conflict_state(T) wsrep_service->wsrep_thd_get_conflict_state_func(T)
-#define wsrep_thd_is_BF(T,S) wsrep_service->wsrep_thd_is_BF_func(T,S)
-#define wsrep_thd_is_wsrep(T) wsrep_service->wsrep_thd_is_wsrep_func(T)
 #define wsrep_thd_query(T) wsrep_service->wsrep_thd_query_func(T)
-#define wsrep_thd_query_state(T) wsrep_service->wsrep_thd_query_state_func(T)
-#define wsrep_thd_query_state_str(T) wsrep_service->wsrep_thd_query_state_str_func(T)
 #define wsrep_thd_retry_counter(T) wsrep_service->wsrep_thd_retry_counter_func(T)
-#define wsrep_thd_set_conflict_state(T,S) wsrep_service->wsrep_thd_set_conflict_state_func(T,S)
 #define wsrep_thd_ignore_table(T) wsrep_service->wsrep_thd_ignore_table_func(T)
 #define wsrep_thd_trx_seqno(T) wsrep_service->wsrep_thd_trx_seqno_func(T)
-#define wsrep_thd_ws_handle(T) wsrep_service->wsrep_thd_ws_handle_func(T)
-#define wsrep_trx_is_aborting(T) wsrep_service->wsrep_trx_is_aborting_func(T)
-#define wsrep_trx_order_before(T1,T2) wsrep_service->wsrep_trx_order_before_func(T1,T2)
-#define wsrep_unlock_rollback() wsrep_service->wsrep_unlock_rollback_func()
 #define wsrep_set_data_home_dir(A) wsrep_service->wsrep_set_data_home_dir_func(A)
-
-#define wsrep_debug get_wsrep_debug()
-#define wsrep_log_conflicts get_wsrep_log_conflicts()
-#define wsrep_certify_nonPK get_wsrep_certify_nonPK()
-#define wsrep_load_data_splitting get_wsrep_load_data_splitting()
-#define wsrep_drupal_282555_workaround get_wsrep_drupal_282555_workaround()
-#define wsrep_recovery get_wsrep_recovery()
-#define wsrep_protocol_version get_wsrep_protocol_version()
+#define wsrep_thd_is_BF(T,S) wsrep_service->wsrep_thd_is_BF_func(T,S)
+#define wsrep_thd_is_aborting(T) wsrep_service->wsrep_thd_is_aborting_func(T)
+#define wsrep_thd_is_local(T) wsrep_service->wsrep_thd_is_local_func(T)
+#define wsrep_thd_self_abort(T) wsrep_service->wsrep_thd_self_abort_func(T)
+#define wsrep_thd_append_key(T,W,N,K) wsrep_service->wsrep_thd_append_key_func(T,W,N,K)
+#define wsrep_thd_client_state_str(T) wsrep_service->wsrep_thd_client_state_str_func(T)
+#define wsrep_thd_client_mode_str(T) wsrep_service->wsrep_thd_client_mode_str_func(T)
+#define wsrep_thd_transaction_state_str(T) wsrep_service->wsrep_thd_transaction_state_str_func(T)
+#define wsrep_thd_transaction_id(T) wsrep_service->wsrep_thd_transaction_id_func(T)
+#define wsrep_thd_bf_abort(T,T2,S) wsrep_service->wsrep_thd_bf_abort_func(T,T2,S)
+#define wsrep_thd_order_before(L,R) wsrep_service->wsrep_thd_order_before_func(L,R)
+#define wsrep_handle_SR_rollback(B,V) wsrep_service->wsrep_handle_SR_rollback_func(B,V)
+#define wsrep_thd_skip_locking(T) wsrep_service->wsrep_thd_skip_locking_func(T)
+#define wsrep_get_sr_table_name() wsrep_service->wsrep_get_sr_table_name_func()
+#define wsrep_get_debug() wsrep_service->wsrep_get_debug_func()
 
 #else
 
+#define MYSQL_SERVICE_WSREP_STATIC_INCLUDED
 extern my_bool wsrep_debug;
 extern my_bool wsrep_log_conflicts;
 extern my_bool wsrep_certify_nonPK;
@@ -176,54 +130,81 @@ extern my_bool wsrep_drupal_282555_workaround;
 extern my_bool wsrep_recovery;
 extern long wsrep_protocol_version;
 
-bool wsrep_consistency_check(THD *thd);
-bool wsrep_prepare_key(const unsigned char* cache_key, size_t cache_key_len, const unsigned char* row_id, size_t row_id_len, struct wsrep_buf* key, size_t* key_len);
-char *wsrep_thd_query(THD *thd);
-const char *wsrep_thd_conflict_state_str(THD *thd);
-const char *wsrep_thd_exec_mode_str(THD *thd);
-const char *wsrep_thd_query_state_str(THD *thd);
-enum wsrep_conflict_state wsrep_thd_conflict_state(MYSQL_THD thd, my_bool sync);
-enum wsrep_conflict_state wsrep_thd_get_conflict_state(MYSQL_THD thd);
-enum wsrep_exec_mode wsrep_thd_exec_mode(THD *thd);
-enum wsrep_query_state wsrep_thd_query_state(THD *thd);
-enum wsrep_trx_status wsrep_run_wsrep_commit(THD *thd, bool all);
-int wsrep_is_wsrep_xid(const struct xid_t* xid);
-long long wsrep_xid_seqno(const struct xid_t* xid);
+extern "C" bool wsrep_consistency_check(MYSQL_THD thd);
+bool wsrep_prepare_key_for_innodb(MYSQL_THD thd, const unsigned char* cache_key, size_t cache_key_len, const unsigned char* row_id, size_t row_id_len, struct wsrep_buf* key, size_t* key_len);
+extern "C" const char *wsrep_thd_query(const MYSQL_THD thd);
+extern "C" int wsrep_is_wsrep_xid(const void* xid);
+extern "C" long long wsrep_xid_seqno(const struct xid_t* xid);
 const unsigned char* wsrep_xid_uuid(const struct xid_t* xid);
-int wsrep_on(MYSQL_THD thd);
-int wsrep_thd_retry_counter(THD *thd);
-int wsrep_trx_is_aborting(MYSQL_THD thd);
-int wsrep_trx_order_before(MYSQL_THD thd1, MYSQL_THD thd2);
-long get_wsrep_protocol_version();
-long long wsrep_thd_trx_seqno(THD *thd);
-my_bool get_wsrep_certify_nonPK();
-my_bool get_wsrep_debug();
-my_bool get_wsrep_drupal_282555_workaround();
+extern "C" long long wsrep_thd_trx_seqno(const MYSQL_THD thd);
 my_bool get_wsrep_recovery();
-my_bool get_wsrep_load_data_splitting();
-my_bool get_wsrep_log_conflicts();
-my_bool wsrep_aborting_thd_contains(THD *thd);
-my_bool wsrep_thd_is_BF(MYSQL_THD thd, my_bool sync);
-my_bool wsrep_thd_is_wsrep(MYSQL_THD thd);
-struct wsrep *get_wsrep();
-struct wsrep_ws_handle *wsrep_thd_ws_handle(THD *thd);
-void wsrep_aborting_thd_enqueue(THD *thd);
-void wsrep_lock_rollback();
-void wsrep_post_commit(THD* thd, bool all);
-void wsrep_thd_LOCK(THD *thd);
-void wsrep_thd_UNLOCK(THD *thd);
-void wsrep_thd_awake(THD *thd, my_bool signal);
-void wsrep_thd_set_conflict_state(THD *thd, enum wsrep_conflict_state state);
-bool wsrep_thd_ignore_table(THD *thd);
-void wsrep_unlock_rollback();
+bool wsrep_thd_ignore_table(MYSQL_THD thd);
 void wsrep_set_data_home_dir(const char *data_dir);
 
+/* from mysql wsrep-lib */
+#include "my_global.h"
+#include "my_pthread.h"
+
+/* Return true if wsrep is enabled for a thd. This means that
+   wsrep is enabled globally and the thd has wsrep on */
+extern "C" my_bool wsrep_on(const MYSQL_THD thd);
+/* Lock thd wsrep lock */
+extern "C" void wsrep_thd_LOCK(const MYSQL_THD thd);
+/* Unlock thd wsrep lock */
+extern "C" void wsrep_thd_UNLOCK(const MYSQL_THD thd);
+
+/* Return thd client state string */
+extern "C" const char* wsrep_thd_client_state_str(const MYSQL_THD thd);
+/* Return thd client mode string */
+extern "C" const char* wsrep_thd_client_mode_str(const MYSQL_THD thd);
+/* Return thd transaction state string */
+extern "C" const char* wsrep_thd_transaction_state_str(const MYSQL_THD thd);
+
+/* Return current transaction id */
+extern "C" query_id_t wsrep_thd_transaction_id(const MYSQL_THD thd);
+/* Mark thd own transaction as aborted */
+extern "C" void wsrep_thd_self_abort(MYSQL_THD thd);
+/* Return true if thd is in replicating mode */
+extern "C" my_bool wsrep_thd_is_local(const MYSQL_THD thd);
+/* Return true if thd is in high priority mode */
+/* todo: rename to is_high_priority() */
+extern "C" my_bool wsrep_thd_is_applying(const MYSQL_THD thd);
+/* Return true if thd is in TOI mode */
+extern "C" my_bool wsrep_thd_is_toi(const MYSQL_THD thd);
+/* Return true if thd is in replicating TOI mode */
+extern "C" my_bool wsrep_thd_is_local_toi(const MYSQL_THD thd);
+/* Return true if thd is in RSU mode */
+extern "C" my_bool wsrep_thd_is_in_rsu(const MYSQL_THD thd);
+/* Return true if thd is in BF mode, either high_priority or TOI */
+extern "C" my_bool wsrep_thd_is_BF(const MYSQL_THD thd, my_bool sync);
+/* Return true if thd is streaming */
+extern "C" my_bool wsrep_thd_is_SR(const MYSQL_THD thd);
+extern "C" void wsrep_handle_SR_rollback(MYSQL_THD BF_thd, MYSQL_THD victim_thd);
+/* Return thd retry counter */
+extern "C" int wsrep_thd_retry_counter(const MYSQL_THD thd);
+/* BF abort victim_thd */
+extern "C" my_bool wsrep_thd_bf_abort(const MYSQL_THD bf_thd,
+                                      MYSQL_THD victim_thd,
+                                      my_bool signal);
+/* Return true if left thd is ordered before right thd */
+extern "C" my_bool wsrep_thd_order_before(const MYSQL_THD left, const MYSQL_THD right);
+/* Return true if thd should skip locking. This means that the thd
+   is operating on shared resource inside commit order critical section. */
+extern "C" my_bool wsrep_thd_skip_locking(const MYSQL_THD thd);
+/* Return true if thd is aborting */
+extern "C" my_bool wsrep_thd_is_aborting(const MYSQL_THD thd);
+
+struct wsrep_key;
+struct wsrep_key_array;
+extern "C" int wsrep_thd_append_key(MYSQL_THD thd,
+                                    const struct wsrep_key* key,
+                                    int n_keys,
+                                    enum Wsrep_service_key_type);
+
+extern const char* wsrep_sr_table_name_full;
+
+extern "C" const char* wsrep_get_sr_table_name();
+
+extern "C" my_bool wsrep_get_debug();
 #endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#define MYSQL_SERVICE_WSREP_INCLUDED
-#endif
-
+#endif /* MYSQL_SERVICE_WSREP_INCLUDED */
diff --git a/include/mysql/services.h b/include/mysql/services.h
index 6168c5ed8dc..6dc970df1e6 100644
--- a/include/mysql/services.h
+++ b/include/mysql/services.h
@@ -39,6 +39,7 @@ extern "C" {
 #include <mysql/service_thd_specifics.h>
 #include <mysql/service_thd_timezone.h>
 #include <mysql/service_thd_wait.h>
+#include <mysql/service_json.h>
 /*#include <mysql/service_wsrep.h>*/
 
 #ifdef __cplusplus
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 902c0ff2706..8b0847ab399 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -231,6 +231,7 @@ enum enum_indicator_type
 #define REFRESH_DES_KEY_FILE    (1ULL << 18)
 #define REFRESH_USER_RESOURCES  (1ULL << 19)
 #define REFRESH_FOR_EXPORT      (1ULL << 20) /* FLUSH TABLES ... FOR EXPORT */
+#define REFRESH_SSL             (1ULL << 21)
 
 #define REFRESH_GENERIC         (1ULL << 30)
 #define REFRESH_FAST            (1ULL << 31) /* Intern flag */
diff --git a/include/service_versions.h b/include/service_versions.h
index 753d6444475..050012d30b9 100644
--- a/include/service_versions.h
+++ b/include/service_versions.h
@@ -42,3 +42,4 @@
 #define VERSION_thd_timezone            0x0100
 #define VERSION_thd_wait                0x0100
 #define VERSION_wsrep                   0x0202
+#define VERSION_json                    0x0100
diff --git a/include/thr_lock.h b/include/thr_lock.h
index e6451bf21c4..ee15fd7315d 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -168,9 +168,9 @@ void thr_set_lock_wait_callback(void (*before_wait)(void),
                                 void (*after_wait)(void));
 
 #ifdef WITH_WSREP
-  typedef my_bool (* wsrep_thd_is_brute_force_fun)(void *, my_bool);
-  typedef int (* wsrep_abort_thd_fun)(void *, void *, my_bool);
-  typedef int (* wsrep_on_fun)(void *);
+  typedef my_bool (* wsrep_thd_is_brute_force_fun)(const MYSQL_THD, my_bool);
+  typedef my_bool(* wsrep_abort_thd_fun)(const MYSQL_THD, MYSQL_THD, my_bool);
+  typedef my_bool (* wsrep_on_fun)(const MYSQL_THD);
   void wsrep_thr_lock_init(
     wsrep_thd_is_brute_force_fun bf_fun, wsrep_abort_thd_fun abort_fun,
     my_bool debug, my_bool convert_LOCK_to_trx, wsrep_on_fun on_fun);
diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h
index f5fdbfbdf47..cd53306e851 100644
--- a/include/thread_pool_priv.h
+++ b/include/thread_pool_priv.h
@@ -61,9 +61,6 @@ void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var);
 my_socket thd_get_fd(THD *thd);
 int thd_store_globals(THD* thd);
 
-THD *first_global_thread();
-THD *next_global_thread(THD *thd);
-
 /* Print to the MySQL error log */
 void sql_print_error(const char *format, ...);
 
diff --git a/include/wsrep.h b/include/wsrep.h
index f7a9b6b0231..df8a88e1c69 100644
--- a/include/wsrep.h
+++ b/include/wsrep.h
@@ -13,11 +13,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
-#include <my_config.h>
-
 #ifndef WSREP_INCLUDED
 #define WSREP_INCLUDED
 
+#include <my_config.h>
+
 #ifdef WITH_WSREP
 #define IF_WSREP(A,B) A
 #define DBUG_ASSERT_IF_WSREP(A) DBUG_ASSERT(A)
@@ -28,12 +28,14 @@
     goto wsrep_error_label;
 
 #define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_) \
-  if (WSREP_ON && WSREP(thd) && wsrep_to_isolation_begin(thd, db_, table_,    \
-                                             table_list_, alter_info_))       \
+  if (WSREP(thd) && wsrep_thd_is_local(thd) &&                          \
+      wsrep_to_isolation_begin(thd, db_, table_,                        \
+                               table_list_, alter_info_))               \
     goto wsrep_error_label;
 
-#define WSREP_TO_ISOLATION_END                                              \
-  if (WSREP_ON && (WSREP(thd) || (thd && thd->wsrep_exec_mode==TOTAL_ORDER))) \
+#define WSREP_TO_ISOLATION_END                                          \
+  if ((WSREP(thd) && wsrep_thd_is_local_toi(thd)) ||                    \
+      wsrep_thd_is_in_rsu(thd))                                         \
     wsrep_to_isolation_end(thd);
 
 /*
@@ -54,19 +56,22 @@
     { if (WSREP_CLIENT(thd_) &&                                         \
           wsrep_sync_wait(thd_, before_)) goto wsrep_error_label; }
 
-#else
+#else /* !WITH_WSREP */
+
+/* These macros are needed to compile MariaDB without WSREP support
+ * (e.g. embedded) */
+
 #define IF_WSREP(A,B) B
-#define DBUG_ASSERT_IF_WSREP(A)
+//#define DBUG_ASSERT_IF_WSREP(A)
 #define WSREP_DEBUG(...)
-#define WSREP_INFO(...)
-#define WSREP_WARN(...)
+//#define WSREP_INFO(...)
+//#define WSREP_WARN(...)
 #define WSREP_ERROR(...)
 #define WSREP_TO_ISOLATION_BEGIN(db_, table_, table_list_) do { } while(0)
 #define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_)
 #define WSREP_TO_ISOLATION_END
 #define WSREP_TO_ISOLATION_BEGIN_WRTCHK(db_, table_, table_list_)
 #define WSREP_SYNC_WAIT(thd_, before_)
-
 #endif /* WITH_WSREP */
 
 #endif /* WSREP_INCLUDED */