diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:09:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:09:01 +0200 |
| commit | b7ae4d442aa32752798f1d3b6122c35c4ebe2d07 (patch) | |
| tree | 8389a43f1db8c01fbc016e07208b111bee428177 /storage/innobase/buf | |
| parent | f124d71ab75e0d449eb80fb909fa3b0ac4b191a8 (diff) | |
| parent | 4783f37cf79150db55a7258683e50a04d987af1d (diff) | |
| download | mariadb-git-b7ae4d442aa32752798f1d3b6122c35c4ebe2d07.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/buf')
| -rw-r--r-- | storage/innobase/buf/buf0dblwr.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc index 3c59955dbd8..88e5823e78b 100644 --- a/storage/innobase/buf/buf0dblwr.cc +++ b/storage/innobase/buf/buf0dblwr.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2021, MariaDB Corporation. +Copyright (c) 2013, 2022, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -253,7 +253,7 @@ dberr_t buf_dblwr_t::init_or_load_pages(pfs_os_file_t file, const char *path) /* Read the TRX_SYS header to check if we are using the doublewrite buffer */ dberr_t err= os_file_read(IORequestRead, file, read_buf, TRX_SYS_PAGE_NO << srv_page_size_shift, - srv_page_size); + srv_page_size, nullptr); if (err != DB_SUCCESS) { @@ -285,7 +285,7 @@ func_exit: /* Read the pages from the doublewrite buffer to memory */ err= os_file_read(IORequestRead, file, write_buf, block1.page_no() << srv_page_size_shift, - size << srv_page_size_shift); + size << srv_page_size_shift, nullptr); if (err != DB_SUCCESS) { @@ -296,7 +296,7 @@ func_exit: err= os_file_read(IORequestRead, file, write_buf + (size << srv_page_size_shift), block2.page_no() << srv_page_size_shift, - size << srv_page_size_shift); + size << srv_page_size_shift, nullptr); if (err != DB_SUCCESS) { ib::error() << "Failed to read the second double write buffer extent"; |