diff options
| author | unknown <monty@mysql.com> | 2005-01-15 03:49:07 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-15 03:49:07 +0200 |
| commit | 403541d7e8af62011422c54d857051a40ccf245c (patch) | |
| tree | 3bcf35791b10e121565898027952d04a93be916f /sql/filesort.cc | |
| parent | 6f70a1d90931f34adb3bdc8b15e20b768af4f357 (diff) | |
| parent | deac81af88c0bc424126d3a9d3d4aaeca2a6770c (diff) | |
| download | mariadb-git-403541d7e8af62011422c54d857051a40ccf245c.tar.gz | |
Merge
include/my_sys.h:
Auto merged
sql/filesort.cc:
Auto merged
mysys/mf_iocache.c:
SCCS merged
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 2 |
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 |