From 6d280ac1615efe5f67843a27c18af080acadc383 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Sat, 15 Jan 2005 03:47:06 +0200
Subject: Fixed possible access to unintialized memory in filesort when using
 many buffers

---
 sql/filesort.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sql/filesort.cc')

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
-- 
cgit v1.2.1