diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:14:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:14:33 +0300 |
| commit | d3350c160a7a884e97a5e4a696432230c13d53e0 (patch) | |
| tree | f7f5c35737b4c87dcfac73f7547d0d2321276be9 /storage/innobase/include/btr0btr.h | |
| parent | a39c4b5f9f7f4d2766f1ddb9487de27259e804a1 (diff) | |
| parent | b6bb64e54a3e34a20cda34e25b6ec62a097955ef (diff) | |
| download | mariadb-git-d3350c160a7a884e97a5e4a696432230c13d53e0.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/btr0btr.h')
| -rw-r--r-- | storage/innobase/include/btr0btr.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h index 2644a3c115a..1ec2eee9a77 100644 --- a/storage/innobase/include/btr0btr.h +++ b/storage/innobase/include/btr0btr.h @@ -238,7 +238,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 zip_size ROW_FORMAT=COMPRESSED page size, or 0 @@ -246,36 +245,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, zip_size, mode, index, mtr) \ +# define btr_block_get(page_id, zip_size, mode, index, mtr) \ btr_block_get_func(page_id, zip_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 zip_size ROW_FORMAT=COMPRESSED page size, or 0 -@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, zip_size, mode, index, mtr) \ - btr_block_get_func(page_id, zip_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 zip_size compressed page size in bytes or 0 for uncompressed pages -@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, - ulint zip_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 */ |