=== modified file 'innobase/lock/lock0lock.c' --- innobase/lock/lock0lock.c 2009-12-01 10:24:44 +0000 +++ innobase/lock/lock0lock.c 2009-12-20 21:55:49 +0000 @@ -1816,7 +1816,7 @@ /* Check if a deadlock occurs: if yes, remove the lock request and return an error code */ - if (lock_deadlock_occurs(lock, trx)) { + if (0 && lock_deadlock_occurs(lock, trx)) { lock_reset_lock_and_trx_wait(lock); lock_rec_reset_nth_bit(lock, rec_get_heap_no(rec, @@ -3524,7 +3524,7 @@ /* Check if a deadlock occurs: if yes, remove the lock request and return an error code */ - if (lock_deadlock_occurs(lock, trx)) { + if (0 && lock_deadlock_occurs(lock, trx)) { lock_reset_lock_and_trx_wait(lock); lock_table_remove_low(lock);