Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä 2019-09-25 10:14:33 +03:00
commit d3350c160a
42 changed files with 278 additions and 140 deletions

View file

@ -96,35 +96,6 @@ btr_page_set_index_id(
}
}
/** 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 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,
ulint zip_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, zip_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 */