From a30d3cd8473e7d4ad3412a042741f34dcb004e80 Mon Sep 17 00:00:00 2001
From: "heikki@hundin.mysql.fi" <>
Date: Wed, 5 Feb 2003 01:42:07 +0200
Subject: [PATCH] ha_innobase.cc:   Backport from 4.0: fix potential bug if
 store_lock is called with TL_IGNORE in the middle of a query

---
 sql/ha_innobase.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 7045e5c31d5..5b2af70f34e 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -3700,7 +3700,7 @@ ha_innobase::store_lock(
 		binlog) requires the use of a locking read */
 
 		prebuilt->select_lock_type = LOCK_S;
-	} else {
+	} else if (lock_type != TL_IGNORE) {
 		/* We set possible LOCK_X value in external_lock, not yet
 		here even if this would be SELECT ... FOR UPDATE */