summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-01-15 03:49:07 +0200
committermonty@mysql.com <>2005-01-15 03:49:07 +0200
commit7681e624229ded43c120f73d823a41bd68a33b76 (patch)
tree3bcf35791b10e121565898027952d04a93be916f /sql/filesort.cc
parent5ebcb21f12c21c2634616ce9b87eb96666038523 (diff)
parent6d280ac1615efe5f67843a27c18af080acadc383 (diff)
downloadmariadb-git-7681e624229ded43c120f73d823a41bd68a33b76.tar.gz
Merge
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index cb377070aaa..45478b436a5 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -803,6 +803,8 @@ int merge_many_buff(SORTPARAM *param, uchar *sort_buffer,
if (flush_io_cache(to_file))
break; /* purecov: inspected */
temp=from_file; from_file=to_file; to_file=temp;
+ setup_io_cache(from_file);
+ setup_io_cache(to_file);
*maxbuffer= (uint) (lastbuff-buffpek)-1;
}
close_cached_file(to_file); // This holds old result