Anoter fix for moved IO_CACHE object
This commit is contained in:
parent
deac81af88
commit
896cdbe5df
@ -686,7 +686,10 @@ int merge_many_buff(SORTPARAM *param, uchar *sort_buffer,
|
|||||||
}
|
}
|
||||||
close_cached_file(to_file); // This holds old result
|
close_cached_file(to_file); // This holds old result
|
||||||
if (to_file == t_file)
|
if (to_file == t_file)
|
||||||
|
{
|
||||||
*t_file=t_file2; // Copy result file
|
*t_file=t_file2; // Copy result file
|
||||||
|
setup_io_cache(t_file);
|
||||||
|
}
|
||||||
|
|
||||||
DBUG_RETURN(*maxbuffer >= MERGEBUFF2); /* Return 1 if interrupted */
|
DBUG_RETURN(*maxbuffer >= MERGEBUFF2); /* Return 1 if interrupted */
|
||||||
} /* merge_many_buff */
|
} /* merge_many_buff */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user