Merge with 5.2

1 files changed, 6 insertions, 2 deletions

diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 32b258c0536..2c008a8817a 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -182,8 +182,10 @@ static int check_lock(struct st_lock_list *list, const char* lock_type,
           last_lock_type != TL_WRITE_CONCURRENT_INSERT)
       {
 	fprintf(stderr,
-		"Warning: Found locks from different threads in %s at '%s'.  org_lock_type: %d  last_lock_type: %d  new_lock_type: %d\n",
-		lock_type, where, list->data->type, last_lock_type, data->type);
+		"Warning: Found locks from different threads for lock '%s' in '%s' at '%s'.  org_lock_type: %d  last_lock_type: %d  new_lock_type: %d\n",
+                data->lock->name ? data->lock->name : "",
+		lock_type, where, list->data->type, last_lock_type,
+                data->type);
 	return 1;
       }
       if (no_cond && data->cond)
@@ -410,6 +412,7 @@ void thr_lock_data_init(THR_LOCK *lock,THR_LOCK_DATA *data, void *param)
   data->status_param=param;
   data->cond=0;
   data->priority= 0;
+  data->debug_print_param= 0;
 }
 
 
@@ -884,6 +887,7 @@ void thr_unlock(THR_LOCK_DATA *data, uint unlock_flags)
   data->type=TL_UNLOCK;				/* Mark unlocked */
   check_locks(lock,"after releasing lock",1);
   wake_up_waiters(lock);
+  check_locks(lock,"end of thr_unlock",1);
   pthread_mutex_unlock(&lock->mutex);
   DBUG_VOID_RETURN;
 }