=== modified file 'storage/innobase/lock/lock0lock.c'
--- storage/innobase/lock/lock0lock.c	2009-12-04 10:20:18 +0000
+++ storage/innobase/lock/lock0lock.c	2010-01-05 22:07:59 +0000
@@ -3358,23 +3358,26 @@
 		bit_no = lock_rec_find_set_bit(wait_lock);
 
 		ut_a(bit_no != ULINT_UNDEFINED);
-	}
+                
+                /* get the starting point for the search for row level locks 
+                   since we are scanning from the front of the list */
+                lock = lock_rec_get_first_on_page_addr(wait_lock->un_member.rec_lock.space, 
+                                                       wait_lock->un_member.rec_lock.page_no);
+	}
+        else {
+                /* table level locks use a two-way linked list so scanning backwards is OK */
+                lock = UT_LIST_GET_PREV(un_member.tab_lock.locks,
+						lock);
+        }
 
 	/* Look at the locks ahead of wait_lock in the lock queue */
 
 	for (;;) {
-		if (lock_get_type_low(lock) & LOCK_TABLE) {
 
-			lock = UT_LIST_GET_PREV(un_member.tab_lock.locks,
-						lock);
-		} else {
-			ut_ad(lock_get_type_low(lock) == LOCK_REC);
-			ut_a(bit_no != ULINT_UNDEFINED);
-
-			lock = (lock_t*) lock_rec_get_prev(lock, bit_no);
-		}
 
-		if (lock == NULL) {
+                /* reached the original lock in the queue for row level locks
+                   or past beginning of the list for table level locks */
+		if (lock == NULL || lock == wait_lock) {
 			/* We can mark this subtree as searched */
 			trx->deadlock_mark = 1;
 
@@ -3499,6 +3502,17 @@
 				}
 			}
 		}
+
+                /* next lock to check */
+                if (lock_get_type_low(lock) & LOCK_TABLE) {
+			lock = UT_LIST_GET_PREV(un_member.tab_lock.locks,
+						lock);
+		} else {
+			ut_ad(lock_get_type_low(lock) == LOCK_REC);
+			ut_a(bit_no != ULINT_UNDEFINED);
+
+			lock = (lock_t*) lock_rec_get_next(bit_no, lock);
+		}
 	}/* end of the 'for (;;)'-loop */
 }