1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index e99956f9c8f..a7cbfa07db2 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -1168,6 +1168,9 @@ thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_INFO *owner,
     if (result != THR_LOCK_SUCCESS)
     {						/* Aborted */
       thr_multi_unlock(data,(uint) (pos-data), 0);
+      /* Mark all requested locks as TL_UNLOCK (to simplify lock checking) */
+      for ( ; pos < end ; pos++)
+        (*pos)->type= TL_UNLOCK;
       DBUG_RETURN(result);
     }
     DEBUG_SYNC_C("thr_multi_lock_after_thr_lock");