diff options
| author | Monty <monty@mariadb.org> | 2018-05-24 18:56:33 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-05-24 18:57:52 +0300 |
| commit | 494c981d232678a3ba73abbe1502ddb0f95efcdc (patch) | |
| tree | d01f70d42f4928906f20c7672dc0cf6538e1647e /sql/mf_iocache_encr.cc | |
| parent | 72a8d29e00d4deec7c836228b54e19fa35ab7ad7 (diff) | |
| parent | bfed1bfe28980d3b1404f99a44712242a5108ef5 (diff) | |
| download | mariadb-git-494c981d232678a3ba73abbe1502ddb0f95efcdc.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'sql/mf_iocache_encr.cc')
| -rw-r--r-- | sql/mf_iocache_encr.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mf_iocache_encr.cc b/sql/mf_iocache_encr.cc index d078a183e31..879da12faa4 100644 --- a/sql/mf_iocache_encr.cc +++ b/sql/mf_iocache_encr.cc @@ -49,8 +49,8 @@ static int my_b_encr_read(IO_CACHE *info, uchar *Buffer, size_t Count) if (pos_in_file == info->end_of_file) { - info->read_pos= info->read_end= info->buffer; - info->pos_in_file= pos_in_file; + /* reading past EOF should not empty the cache */ + info->read_pos= info->read_end; info->error= 0; DBUG_RETURN(MY_TEST(Count)); } |