diff options
| author | monty@mysql.com <> | 2005-01-18 03:52:15 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-18 03:52:15 +0200 |
| commit | edffca827e40635a3738f7e5b4251033e485f024 (patch) | |
| tree | f8c46e93377fbf30e2983079850d182efe46f89e /sql/filesort.cc | |
| parent | e5b788146af4fd59606245a181659fb84575bcab (diff) | |
| parent | 5ba79d72a77b12c3158a3e0bd271a6c5e4c499ad (diff) | |
| download | mariadb-git-edffca827e40635a3738f7e5b4251033e485f024.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 45478b436a5..24088210f1a 100644 --- 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 */ |