diff options
| author | unknown <monty@mysql.com> | 2005-01-18 03:52:15 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-18 03:52:15 +0200 |
| commit | 985805ce6afefaf2715732809aa00c5396990662 (patch) | |
| tree | f8c46e93377fbf30e2983079850d182efe46f89e | |
| parent | 96f64b4440daa411a887ded45d5cee1daca99360 (diff) | |
| parent | 896cdbe5df80f942a43e784336052cb2cce5871c (diff) | |
| download | mariadb-git-985805ce6afefaf2715732809aa00c5396990662.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
sql/filesort.cc:
Auto merged
| -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 */ |