summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-01-18 02:04:41 +0200
committerunknown <monty@mysql.com>2005-01-18 02:04:41 +0200
commit896cdbe5df80f942a43e784336052cb2cce5871c (patch)
tree4abb29d57b3b38a1f364fd6064b549c362bdbfb7 /sql/filesort.cc
parentdeac81af88c0bc424126d3a9d3d4aaeca2a6770c (diff)
downloadmariadb-git-896cdbe5df80f942a43e784336052cb2cce5871c.tar.gz
Anoter fix for moved IO_CACHE object
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index fe42f391007..a53067ccd73 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -686,7 +686,10 @@ int merge_many_buff(SORTPARAM *param, uchar *sort_buffer,
}
close_cached_file(to_file); // This holds old result
if (to_file == t_file)
+ {
*t_file=t_file2; // Copy result file
+ setup_io_cache(t_file);
+ }
DBUG_RETURN(*maxbuffer >= MERGEBUFF2); /* Return 1 if interrupted */
} /* merge_many_buff */