From 5fedf659d8806c9aef9057797dc70ca719f44d1c Mon Sep 17 00:00:00 2001
From: "heikki@hundin.mysql.fi" <>
Date: Tue, 19 Nov 2002 16:54:52 +0200
Subject: [PATCH] row0mysql.c, row0mysql.h:   Backport of bug fix in 4.0: do
 not x-lock rows under LOCK TABLES READ unless the table is a temp table

---
 innobase/include/row0mysql.h | 1 +
 innobase/row/row0mysql.c     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h
index 8152c534f48..75c16384458 100644
--- a/innobase/include/row0mysql.h
+++ b/innobase/include/row0mysql.h
@@ -393,6 +393,7 @@ struct row_prebuilt_struct {
 					an SQL statement: we may have to set
 					an intention lock on the table,
 					create a consistent read view etc. */
+        ibool           mysql_has_locked;
 	ibool		clust_index_was_generated;
 					/* if the user did not define a
 					primary key in MySQL, then Innobase
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index ebb3cbe8dc8..705ded785fc 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -320,6 +320,7 @@ row_create_prebuilt(
 	prebuilt->trx = NULL;
 
 	prebuilt->sql_stat_start = TRUE;
+	prebuilt->mysql_has_locked = FALSE;
 
 	prebuilt->index = NULL;
 	prebuilt->n_template = 0;