A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).

04328c3d · ramil@mysql.com · ec775b65 · 04328c3d
Commit 04328c3d authored Mar 15, 2005 by ramil@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

sql/filesort.cc sql/filesort.cc +5 -2

No files found.
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -452,8 +452,11 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
    if (*killed)
    {
      DBUG_PRINT("info",("Sort killed by user"));
-      (void) file->extra(HA_EXTRA_NO_CACHE);
+      if (!indexfile && !quick_select)
-      file->ha_rnd_end();
+      {
+        (void) file->extra(HA_EXTRA_NO_CACHE);
+        file->ha_rnd_end();
+      }
      DBUG_RETURN(HA_POS_ERROR);		/* purecov: inspected */
    }
    if (error == 0)