diff options
author | serg@serg.mysql.com <> | 2002-06-30 23:29:25 +0000 |
---|---|---|
committer | serg@serg.mysql.com <> | 2002-06-30 23:29:25 +0000 |
commit | f3e1fb4d4c5948feb31fc7ca6ac43ffef4e35173 (patch) | |
tree | 34d47229775b8c950730434ea91db7a4bb43856f /mysys/mf_iocache.c | |
parent | ac26ba181edda3d87bf247e27d932c09befa9a72 (diff) | |
download | mariadb-git-f3e1fb4d4c5948feb31fc7ca6ac43ffef4e35173.tar.gz |
post-merge fix
Diffstat (limited to 'mysys/mf_iocache.c')
-rw-r--r-- | mysys/mf_iocache.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 6ad5397e61f..54513ba73de 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -508,7 +508,6 @@ int _my_b_read_r(register IO_CACHE *info, byte *Buffer, uint Count) pos_in_file= info->pos_in_file + (uint)(info->read_end - info->buffer); diff_length= (uint) (pos_in_file & (IO_SIZE-1)); length=IO_ROUND_UP(Count+diff_length)-diff_length; - length=IO_ROUND_UP(Count+diff_length)-diff_length; length=(length <= info->read_length) ? length + IO_ROUND_DN(info->read_length - length) : length - IO_ROUND_UP(length - info->read_length) ; |