Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1

2005-01-18 03:52:15 +02:00 · 2005-01-18 03:52:15 +02:00 · edffca827e
commit edffca827e
parent e5b788146a 5ba79d72a7
1 changed files with 3 additions and 0 deletions
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@ -809,7 +809,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 */