1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ramil@mysql.com 2005-03-15 15:32:11 +04:00
parent ec775b65f5
commit 04328c3dfa
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/filesort.cc
View File

@ -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);
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)