mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
branches/zip: row_merge_read(): Call os_file_read_no_error_handling()
instead of os_file_read(). Display some fault diagnostics.
This commit is contained in:
parent
bbe0043055
commit
9d5af49407
1 changed files with 12 additions and 4 deletions
|
@ -504,11 +504,19 @@ row_merge_read(
|
|||
row_merge_block_t* buf) /* out: data */
|
||||
{
|
||||
ib_uint64_t ofs = ((ib_uint64_t) offset) * sizeof *buf;
|
||||
ibool success;
|
||||
|
||||
return(UNIV_LIKELY(os_file_read(OS_FILE_FROM_FD(fd), buf,
|
||||
(ulint) (ofs & 0xFFFFFFFF),
|
||||
(ulint) (ofs >> 32),
|
||||
sizeof *buf)));
|
||||
success = os_file_read_no_error_handling(OS_FILE_FROM_FD(fd), buf,
|
||||
(ulint) (ofs & 0xFFFFFFFF),
|
||||
(ulint) (ofs >> 32),
|
||||
sizeof *buf);
|
||||
if (UNIV_UNLIKELY(!success)) {
|
||||
ut_print_timestamp(stderr);
|
||||
fprintf(stderr,
|
||||
" InnoDB: failed to read merge block at %llu\n", ofs);
|
||||
}
|
||||
|
||||
return(UNIV_LIKELY(success));
|
||||
}
|
||||
|
||||
/************************************************************************
|
||||
|
|
Loading…
Add table
Reference in a new issue