Merge with 5.2

1 files changed, 2 insertions, 2 deletions

diff --git a/include/thr_lock.h b/include/thr_lock.h
index ec24bbabddd..800467f32cd 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -123,10 +123,9 @@ typedef struct st_thr_lock_data {
   struct st_thr_lock *lock;
   pthread_cond_t *cond;
   void *status_param;			/* Param to status functions */
+  void *debug_print_param;              /* For error messages */
   enum thr_lock_type type;
-
   enum thr_lock_type org_type;		/* Cache for MariaDB */
-  void *debug_print_param;              /* For error messages */
   uint priority;
 } THR_LOCK_DATA;
 
@@ -151,6 +150,7 @@ typedef struct st_thr_lock {
   my_bool (*start_trans)(void*);	/* When all locks are taken */
   my_bool (*check_status)(void *);
   void   (*fix_status)(void *, void *);/* For thr_merge_locks() */
+  const char *name;                     /* Used for error reporting */
   my_bool allow_multiple_concurrent_insert;
 } THR_LOCK;