database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

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

Browse Source
This commit is contained in:
monty@mysql.com
2005-01-18 03:52:15 +02:00
parent e5b788146a 5ba79d72a7
commit edffca827e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/filesort.cc
View File

@@ -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 */