From 4d18b2ec676f24857f864fbf8183a60bbc2ef17f Mon Sep 17 00:00:00 2001 From: hvlad Date: Fri, 25 Sep 2009 18:37:00 +0000 Subject: [PATCH] Backport fix for bug CORE-2640 : A regular deadlock may not be detected by the lock manager under some conditions, thus resulting in a hang --- src/lock/lock.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp index 54862b08e2..ce09e81f3e 100644 --- a/src/lock/lock.cpp +++ b/src/lock/lock.cpp @@ -3671,8 +3671,11 @@ static void post_pending( LBL lock) if (request->lrq_flags & LRQ_pending) break; - if (!(request->lrq_flags & (LRQ_blocking_seen | LRQ_blocking))) + if (!(request->lrq_flags & (LRQ_blocking_seen | LRQ_blocking)) && + request->lrq_ast_routine) + { request->lrq_flags |= LRQ_just_granted; + } } } }