From: Date: March 15 2005 12:32pm
Subject: bk commit into 4.1 tree (ramil:1.2118) BUG#8799
List-Archive: http://lists.mysql.com/internals/23034
X-Bug: 8799
Message-Id: <200503151132.j2FBWG3L056782@gw.mysql.r18.ru>

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2118 05/03/15 15:32:11 ramil@stripped +1 -0
  A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).

  sql/filesort.cc
    1.93 05/03/15 15:32:06 ramil@stripped +5 -2
    A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).              
    Should call ha_rnd_end() only if ha_rnd_init() was called.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/4.1.b8799

--- 1.92/sql/filesort.cc	2005-03-09 18:50:57 +04:00
+++ 1.93/sql/filesort.cc	2005-03-15 15:32:06 +04:00
@@ -452,8 +452,11 @@
     if (*killed)
     {
       DBUG_PRINT("info",("Sort killed by user"));
-      (void) file->extra(HA_EXTRA_NO_CACHE);
-      file->ha_rnd_end();
+      if (!indexfile && !quick_select)
+      {
+        (void) file->extra(HA_EXTRA_NO_CACHE);
+        file->ha_rnd_end();
+      }
       DBUG_RETURN(HA_POS_ERROR);		/* purecov: inspected */
     }
     if (error == 0)