diff options
Diffstat (limited to 'storage/innobase/include/btr0btr.ic')
-rw-r--r-- | storage/innobase/include/btr0btr.ic | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic index 2669611a9e6..3cdf279f25f 100644 --- a/storage/innobase/include/btr0btr.ic +++ b/storage/innobase/include/btr0btr.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2017, MariaDB Corporation. +Copyright (c) 2015, 2019, 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 @@ -31,6 +31,7 @@ Created 6/2/1994 Heikki Tuuri /** Gets a buffer page and declares its latching order level. @param[in] page_id page id +@param[in] zip_size ROW_FORMAT=COMPRESSED page size, or 0 @param[in] mode latch mode @param[in] file file name @param[in] line line where called @@ -42,7 +43,7 @@ UNIV_INLINE buf_block_t* btr_block_get_func( const page_id_t page_id, - const page_size_t& page_size, + ulint zip_size, ulint mode, const char* file, unsigned line, @@ -53,7 +54,7 @@ btr_block_get_func( dberr_t err=DB_SUCCESS; block = buf_page_get_gen( - page_id, page_size, mode, NULL, BUF_GET, file, line, mtr, &err); + page_id, zip_size, mode, NULL, BUF_GET, file, line, mtr, &err); if (err == DB_DECRYPTION_FAILED) { if (index && index->table) { @@ -96,7 +97,7 @@ btr_page_set_index_id( } /** Gets a buffer page and declares its latching order level. -@param space tablespace identifier +@param page_id tablespace/page identifier @param zip_size compressed page size in bytes or 0 for uncompressed pages @param page_no page number @param mode latch mode @@ -106,9 +107,8 @@ btr_page_set_index_id( UNIV_INLINE page_t* btr_page_get( -/*=========*/ const page_id_t page_id, - const page_size_t& page_size, + ulint zip_size, ulint mode, dict_index_t* index, mtr_t* mtr) @@ -116,7 +116,7 @@ btr_page_get( buf_block_t* block=NULL; buf_frame_t* frame=NULL; - block = btr_block_get(page_id, page_size, mode, index, mtr); + block = btr_block_get(page_id, zip_size, mode, index, mtr); if (block) { frame = buf_block_get_frame(block); |