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

edffca82 · monty@mysql.com · e5b78814 · 5ba79d72 · edffca82
Commit edffca82 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
@@ -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 */