1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-15064: IO_CACHE mysys read_pos, not libmaria rc_pos

Browse Source 
It seems some overly tolerant compilers (gcc) allow the structure
of IO_CACHE that is defined differently in libmaria to have
members equalivance to the iocache in mysys.

More strict Solaris compilers recognise that rc_pos really
isn't a structure member and won't compile.
This commit is contained in:
Rainer Orth 2020-11-20 16:55:03 +11:00 committed by Daniel Black
parent ab5dc62545
commit 73bf62469e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/mf_iocache.c
View File

@ -1603,7 +1603,7 @@ int _my_b_async_read(IO_CACHE *info, uchar *Buffer, size_t Count)
Buffer+=length; Buffer+=length;
Count-=length; Count-=length;
left_length+=length; left_length+=length;
info->read_end=info->rc_pos+read_length; info->read_end=info->read_pos+read_length;
info->read_pos+=length; info->read_pos+=length;
} }
else else

2
sql/mf_iocache.cc
View File

@ -26,7 +26,7 @@
Used instead of FILE when reading or writing whole files. Used instead of FILE when reading or writing whole files.
This will make mf_rec_cache obsolete. This will make mf_rec_cache obsolete.
One can change info->pos_in_file to a higher value to skip bytes in file if One can change info->pos_in_file to a higher value to skip bytes in file if
also info->rc_pos is set to info->rc_end. also info->read_pos is set to info->read_end.
If called through open_cached_file(), then the temporary file will If called through open_cached_file(), then the temporary file will
only be created if a write exeeds the file buffer or if one calls only be created if a write exeeds the file buffer or if one calls
flush_io_cache(). flush_io_cache().