Commit 985805ce authored by unknown's avatar unknown

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


sql/filesort.cc:
  Auto merged
parents 96f64b44 896cdbe5
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment