From 901cbf0326caa9fd144d4fb872a542d0fa44b8f6 Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/june.mysql.com>
Date: Tue, 26 Dec 2006 22:10:02 +0400
Subject: After merge fix.

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

(limited to 'sql/opt_range.cc')

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index fa575e73c39..577fec64e8d 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1002,6 +1002,11 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT()
     if (file) 
     {
       range_end();
+      if (head->key_read)
+      {
+        head->key_read= 0;
+        file->extra(HA_EXTRA_NO_KEYREAD);
+      }
       if (free_file)
       {
         DBUG_PRINT("info", ("Freeing separate handler 0x%lx (free: %d)", (long) file,
@@ -1010,10 +1015,6 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT()
         file->close();
         delete file;
       }
-      else
-      {
-        file->extra(HA_EXTRA_NO_KEYREAD);
-      }
     }
     delete_dynamic(&ranges); /* ranges are allocated in alloc */
     free_root(&alloc,MYF(0));
@@ -1195,7 +1196,11 @@ end:
   org_file= head->file;
   head->file= file;
   /* We don't have to set 'head->keyread' here as the 'file' is unique */
-  head->mark_columns_used_by_index(index);
+  if (!head->no_keyread)
+  {
+    head->key_read= 1;
+    head->mark_columns_used_by_index(index);
+  }
   head->prepare_for_position();
   head->file= org_file;
   bitmap_copy(&column_bitmap, head->read_set);
-- 
cgit v1.2.1