diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-07 18:54:11 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-08 22:54:37 +0100 |
| commit | 60dfe12be3adaa03a8d409ca2da58e78e6d0c972 (patch) | |
| tree | deb24a73dc6fd63465268799a8d9da77cdff5deb /mysys/mf_iocache.c | |
| parent | 47d1679ac69e96b201622bc0f5b3e5526ba571f2 (diff) | |
| download | mariadb-git-60dfe12be3adaa03a8d409ca2da58e78e6d0c972.tar.gz | |
MDEV-14868 MariaDB server crashes after using ROLLBACK TO when encrypt_tmp_files=ON
Fix reinit_io_cache(WRITE_CACHE) with non-zero seek_offset.
Run encryption.tempfiles with and without binlog checksums.
Diffstat (limited to 'mysys/mf_iocache.c')
| -rw-r--r-- | mysys/mf_iocache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index a0ddc3e40a5..56b1ae3fc6e 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -440,7 +440,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 |