From 3822eeb972dd7e23cb01168a3801e705a8ab8a33 Mon Sep 17 00:00:00 2001
From: "sergefp@mysql.com" <>
Date: Tue, 25 Jan 2005 07:37:06 +0300
Subject: [PATCH] Fix for BUG#8003 attempt 2:   Call file->external_lock() for
 handler objects that index_merge code creates in addition to   the handler
 object opened in open_and_lock_tables.

---
 sql/opt_range.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index e67a9881bba..c3b84564504 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -778,6 +778,7 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT()
         DBUG_PRINT("info", ("Freeing separate handler %p (free=%d)", file,
                             free_file));
         file->reset();
+        file->external_lock(current_thd, F_UNLCK);
         file->close();
       }
     }
@@ -929,6 +930,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
     DBUG_RETURN(0);
   }
 
+  THD *thd= current_thd;
   if (!(file= get_new_handler(head, head->s->db_type)))
     goto failure;
   DBUG_PRINT("info", ("Allocated new handler %p", file));
@@ -937,11 +939,14 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
     /* Caller will free the memory */
     goto failure;
   }
+  if (file->external_lock(thd, F_RDLCK))
+    goto failure;
 
   if (file->extra(HA_EXTRA_KEYREAD) ||
       file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
       init() || reset())
   {
+    file->external_lock(thd, F_UNLCK);
     file->close();
     goto failure;
   }