mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge collision.

Browse source
This commit is contained in:
cmiller@zippy.cornsilk.net 2006-11-02 18:27:52 -05:00
parent c34f3219b3
commit e235c8c421
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mysys/mf_iocache.c
View file

@ -963,13 +963,13 @@ int _my_b_read_r(register IO_CACHE *cache, byte *Buffer, uint Count)
"seek_not_done" to indicate this to other functions operating
on the IO_CACHE.
*/
if (info->seek_not_done)
if (cache->seek_not_done)
{
if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0))
if (my_seek(cache->file,pos_in_file,MY_SEEK_SET,MYF(0))
== MY_FILEPOS_ERROR)
{
info->error= -1;
unlock_io_cache(info);
cache->error= -1;
unlock_io_cache(cache);
DBUG_RETURN(1);
}
}