diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2020-11-20 16:55:03 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-04-17 17:44:41 +1000 |
| commit | 73bf62469e0124a088bfddd838a68714ce7d79ea (patch) | |
| tree | b2ce2810a70bd39f1e538b28f68581d4d4b1b497 | |
| parent | ab5dc625458c2fd63489292117d4420610a79a9d (diff) | |
| download | mariadb-git-73bf62469e0124a088bfddd838a68714ce7d79ea.tar.gz | |
MDEV-15064: IO_CACHE mysys read_pos, not libmaria rc_posbb-10.2-danielblack-MDEV-15064-IO_CACHE-read_pos
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.
| -rw-r--r-- | mysys/mf_iocache.c | 2 | ||||
| -rw-r--r-- | sql/mf_iocache.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index e09c7f930c8..8ade76e922e 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1603,7 +1603,7 @@ int _my_b_async_read(IO_CACHE *info, uchar *Buffer, size_t Count) Buffer+=length; Count-=length; left_length+=length; - info->read_end=info->rc_pos+read_length; + info->read_end=info->read_pos+read_length; info->read_pos+=length; } else diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc index 8533c9037aa..e4dc3d44a38 100644 --- a/sql/mf_iocache.cc +++ b/sql/mf_iocache.cc @@ -26,7 +26,7 @@ Used instead of FILE when reading or writing whole files. This will make mf_rec_cache obsolete. 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 only be created if a write exeeds the file buffer or if one calls flush_io_cache(). |