database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.1' into 10.2

Browse Source
This commit is contained in:
Monty
2018-05-24 18:56:33 +03:00
committed by Vicențiu Ciorbaru
parent 72a8d29e00 bfed1bfe28
commit 494c981d23
40 changed files with 822 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mf_iocache_encr.cc
View File

@ -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));
}