Anoter fix for moved IO_CACHE object

5ba79d72 · monty@mysql.com · 6d280ac1 · 5ba79d72
Commit 5ba79d72 authored Jan 18, 2005 by monty@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/filesort.cc sql/filesort.cc +3 -0

No files found.
--- 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 */