mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.2 into 10.3

Browse source
This commit is contained in:
Marko Mäkelä 2019-04-27 20:41:31 +03:00
commit 4d59f45260
39 changed files with 547 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/innobase/row/row0merge.cc
View file

@ -1094,7 +1094,7 @@ row_merge_read(
DBUG_EXECUTE_IF("row_merge_read_failure", DBUG_RETURN(FALSE););
IORequest request(IORequest::READ);
const bool success = os_file_read_no_error_handling(
const bool success = DB_SUCCESS == os_file_read_no_error_handling(
request, fd, buf, ofs, srv_sort_buf_size, 0);
/* If encryption is enabled decrypt buffer */
@ -1156,7 +1156,7 @@ row_merge_write(
}
IORequest request(IORequest::WRITE);
const bool success = os_file_write(
const bool success = DB_SUCCESS == os_file_write(
request, "(merge)", fd, out_buf, ofs, buf_len);
#ifdef POSIX_FADV_DONTNEED