diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 0877b3e9b0e..851cc6e747d 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -4807,7 +4807,7 @@ and the lock released later. @param[in] page_size page size @param[in] unzip true=request uncompressed page @return pointer to the block or NULL */ -buf_page_t *buf_page_init_for_read(dberr_t *err, ulint mode, +buf_page_t *buf_page_init_for_read(ulint mode, const page_id_t &page_id, const page_size_t &page_size, bool unzip) { buf_block_t *block; @@ -4818,8 +4818,6 @@ buf_page_t *buf_page_init_for_read(dberr_t *err, ulint mode, ut_ad(buf_pool); - *err = DB_SUCCESS; - if (mode == BUF_READ_IBUF_PAGES_ONLY) { /* It is a read-ahead within an ibuf routine */ diff --git a/storage/innobase/buf/buf0rea.cc b/storage/innobase/buf/buf0rea.cc index 4440c11b097..20f08d9ab45 100644 --- a/storage/innobase/buf/buf0rea.cc +++ b/storage/innobase/buf/buf0rea.cc @@ -90,7 +90,7 @@ ulint buf_read_page_low(dberr_t *err, bool sync, ulint type, ulint mode, or is being dropped; if we succeed in initing the page in the buffer pool for read, then DISCARD cannot proceed until the read has completed */ - bpage = buf_page_init_for_read(err, mode, page_id, page_size, unzip); + bpage = buf_page_init_for_read(mode, page_id, page_size, unzip); ut_a(bpage == nullptr || bpage->get_space()->id == page_id.space()); diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index 4a3aaea23d4..a92407dcaaf 100644 --- a/storage/innobase/include/buf0buf.h +++ b/storage/innobase/include/buf0buf.h @@ -884,7 +884,7 @@ and the lock released later. @param[in] page_size page size @param[in] unzip true=request uncompressed page @return pointer to the block or NULL */ -buf_page_t *buf_page_init_for_read(dberr_t *err, ulint mode, +buf_page_t *buf_page_init_for_read(ulint mode, const page_id_t &page_id, const page_size_t &page_size, bool unzip);