MDEV-6247: Merge 10.0-galera to 10.1.

Merged lp:maria/maria-10.0-galera up to revision 3879.

Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.

1 files changed, 12 insertions, 1 deletions

diff --git a/include/thr_lock.h b/include/thr_lock.h
index 3f7a5ca988f..2561709285f 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -20,7 +20,6 @@
 #ifdef	__cplusplus
 extern "C" {
 #endif
-
 #include <my_pthread.h>
 #include <my_list.h>
 
@@ -95,6 +94,7 @@ typedef struct st_thr_lock_info
 {
   pthread_t thread;
   my_thread_id thread_id;
+  void *mysql_thd;        // THD pointer
 } THR_LOCK_INFO;
 
 
@@ -164,6 +164,17 @@ my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data,
                                   ulong lock_wait_timeout);
 void thr_set_lock_wait_callback(void (*before_wait)(void),
                                 void (*after_wait)(void));
+
+#ifdef WITH_WSREP
+#include <my_sys.h>
+  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 *);
+  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);
+#endif
+
 #ifdef	__cplusplus
 }
 #endif