diff options
| author | monty@mysql.com <> | 2005-01-15 03:47:06 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-15 03:47:06 +0200 |
| commit | 6d280ac1615efe5f67843a27c18af080acadc383 (patch) | |
| tree | c2e1f8b8bfc0be933a4b5fff758d2b2c6366f881 /sql/filesort.cc | |
| parent | 46e444293afb4179593871646088b525dd638a33 (diff) | |
| download | mariadb-git-6d280ac1615efe5f67843a27c18af080acadc383.tar.gz | |
Fixed possible access to unintialized memory in filesort when using many buffers
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 ae6895b26b9..fe42f391007 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -680,6 +680,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 |