Skip to content

M
mariadb
Commit ac778232 authored by istruewing@chilla.local's avatar istruewing@chilla.local
Browse files
Options

Bug#20719 - Reading dynamic records with write buffer could fail 

After merge fix.
parent 6ff6d80e
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
myisam/mi_dynrec.c
View file @ ac778232
...@@ -1148,9 +1148,6 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf) ...@@ -1148,9 +1148,6 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf)
info->rec_cache.pos_in_file < filepos + MI_BLOCK_INFO_HEADER_LENGTH && info->rec_cache.pos_in_file < filepos + MI_BLOCK_INFO_HEADER_LENGTH &&
flush_io_cache(&info->rec_cache)) flush_io_cache(&info->rec_cache))
goto err; goto err;
/* A corrupted table can have wrong pointers. (Bug# 19835) */
if (block_info.next_filepos == HA_OFFSET_ERROR)
goto panic;
info->rec_cache.seek_not_done=1; info->rec_cache.seek_not_done=1;
if ((b_type= _mi_get_block_info(&block_info, file, filepos)) if ((b_type= _mi_get_block_info(&block_info, file, filepos))
& (BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR | & (BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7