Merge branch '10.1' into 10.2

This commit is contained in:
Sergei Golubchik 2018-02-11 00:23:17 +01:00
commit 49bcc82686
20 changed files with 528 additions and 95 deletions

View file

@ -508,7 +508,7 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
info->read_end= info->buffer;
_my_b_encr_read(info, 0, 0); /* prefill the buffer */
info->write_pos= info->read_pos;
info->pos_in_file+= info->buffer_length;
info->seek_not_done=1;
}
}
else