Initial merge result with mariaDB 10: lp:maria

1 files changed, 13 insertions, 0 deletions

diff --git a/include/thr_lock.h b/include/thr_lock.h
index 3f7a5ca988f..4551a3160ff 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -20,6 +20,15 @@
 #ifdef	__cplusplus
 extern "C" {
 #endif
+#ifdef WITH_WSREP
+#include <my_sys.h>
+  typedef int (* wsrep_thd_is_brute_force_fun)(void *);
+  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
 
 #include <my_pthread.h>
 #include <my_list.h>
@@ -95,6 +104,10 @@ typedef struct st_thr_lock_info
 {
   pthread_t thread;
   my_thread_id thread_id;
+#ifdef WITH_WSREP
+  void *mysql_thd;        // THD pointer
+  my_bool in_lock_tables; // true, if inside locking session
+#endif
 } THR_LOCK_INFO;