diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
| commit | 4a5d25c338a5d1d2cc16343380193d6bf25ae6ae (patch) | |
| tree | 73b84a9c8f3d5e3e3383fa79465b11f9ded512d3 /mysys/mf_iocache.c | |
| parent | 48dc7cc66ef5b69fcf28ec0b2ecf0338c188cf4e (diff) | |
| parent | c13b5011629b5ff7b969d648265002e4d1ba94c2 (diff) | |
| download | mariadb-git-4a5d25c338a5d1d2cc16343380193d6bf25ae6ae.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysys/mf_iocache.c')
| -rw-r--r-- | mysys/mf_iocache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 77581a51d75..bfdda25cafa 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1945,8 +1945,6 @@ int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock) if ((length=(size_t) (info->write_pos - info->write_buffer))) { - info->write_end= (info->write_buffer + info->buffer_length - - ((info->pos_in_file + length) & (IO_SIZE - 1))); if (append_cache) { @@ -1968,6 +1966,8 @@ int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock) set_if_bigger(info->end_of_file, info->pos_in_file); } + info->write_end= (info->write_buffer + info->buffer_length - + ((info->pos_in_file + length) & (IO_SIZE - 1))); info->write_pos= info->write_buffer; ++info->disk_writes; UNLOCK_APPEND_BUFFER; |