diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-24 13:29:23 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-24 13:29:23 +0300 |
commit | ef701bfd075331843f512415541e54ba784d9b98 (patch) | |
tree | cd01e30453a33125f0558bdd2d6fd33807f891a3 /storage/innobase/include | |
parent | ab9f378b0bed85f67cdaf5868af19f814e6bdfe1 (diff) | |
download | mariadb-git-ef701bfd075331843f512415541e54ba784d9b98.tar.gz |
Remove the unused function btr_page_get()
btr_block_get(): Remove #ifdef around the definition
Diffstat (limited to 'storage/innobase/include')
-rw-r--r-- | storage/innobase/include/btr0btr.h | 31 | ||||
-rw-r--r-- | storage/innobase/include/btr0btr.ic | 30 |
2 files changed, 1 insertions, 60 deletions
diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h index f17b6158f36..e00b2545708 100644 --- a/storage/innobase/include/btr0btr.h +++ b/storage/innobase/include/btr0btr.h @@ -236,7 +236,6 @@ btr_block_get_func( dict_index_t* index, mtr_t* mtr); -# ifdef UNIV_DEBUG /** Gets a buffer page and declares its latching order level. @param page_id tablespace/page identifier @param page_size page size @@ -244,37 +243,9 @@ btr_block_get_func( @param index index tree, may be NULL if not the insert buffer tree @param mtr mini-transaction handle @return the block descriptor */ -# define btr_block_get(page_id, page_size, mode, index, mtr) \ +# define btr_block_get(page_id, page_size, mode, index, mtr) \ btr_block_get_func(page_id, page_size, mode, \ __FILE__, __LINE__, (dict_index_t*)index, mtr) -# else /* UNIV_DEBUG */ -/** Gets a buffer page and declares its latching order level. -@param page_id tablespace/page identifier -@param page_size page size -@param mode latch mode -@param index index tree, may be NULL if not the insert buffer tree -@param mtr mini-transaction handle -@return the block descriptor */ -# define btr_block_get(page_id, page_size, mode, index, mtr) \ - btr_block_get_func(page_id, page_size, mode, __FILE__, __LINE__, (dict_index_t*)index, mtr) -# endif /* UNIV_DEBUG */ -/** Gets a buffer page and declares its latching order level. -@param page_id tablespace/page identifier -@param page_size page size -@param mode latch mode -@param index index tree, may be NULL if not the insert buffer tree -@param mtr mini-transaction handle -@return the uncompressed page frame */ -UNIV_INLINE -page_t* -btr_page_get( -/*=========*/ - const page_id_t page_id, - const page_size_t& page_size, - ulint mode, - dict_index_t* index, - mtr_t* mtr) - MY_ATTRIBUTE((warn_unused_result)); /**************************************************************//** Gets the index id field of a page. @return index id */ diff --git a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic index 42d829e12d5..a2f2ec885d9 100644 --- a/storage/innobase/include/btr0btr.ic +++ b/storage/innobase/include/btr0btr.ic @@ -101,36 +101,6 @@ btr_page_set_index_id( } } -/** Gets a buffer page and declares its latching order level. -@param space tablespace identifier -@param zip_size compressed page size in bytes or 0 for uncompressed pages -@param page_no page number -@param mode latch mode -@param idx index tree, may be NULL if not the insert buffer tree -@param mtr mini-transaction handle -@return the uncompressed page frame */ -UNIV_INLINE -page_t* -btr_page_get( -/*=========*/ - const page_id_t page_id, - const page_size_t& page_size, - ulint mode, - dict_index_t* index, - mtr_t* mtr) -{ - buf_block_t* block=NULL; - buf_frame_t* frame=NULL; - - block = btr_block_get(page_id, page_size, mode, index, mtr); - - if (block) { - frame = buf_block_get_frame(block); - } - - return ((page_t*)frame); -} - /**************************************************************//** Gets the index id field of a page. @return index id */ |