Merge 10.2 into 10.3

Author: dr-m

storage/innobase/btr/btr0btr.cc

@@ -775,7 +775,7 @@ btr_node_ptr_set_child_page_no(
 rec_t*	rec,/*!< in: node pointer record */
 page_zip_des_t*	page_zip,/*!< in/out: compressed page whose uncompressed
 part will be updated, or NULL */
-const ulint*	offsets,/*!< in: array returned by rec_get_offsets() */
+const offset_t*	offsets,/*!< in: array returned by rec_get_offsets() */
 ulint	page_no,/*!< in: child node address */
 mtr_t*	mtr)/*!< in: mtr */
 {
@@ -810,7 +810,7 @@ btr_node_ptr_get_child(
 /*===================*/
 const rec_t*	node_ptr,/*!< in: node pointer */
 dict_index_t*	index,/*!< in: index */
-const ulint*	offsets,/*!< in: array returned by rec_get_offsets() */
+const offset_t*	offsets,/*!< in: array returned by rec_get_offsets() */
 mtr_t*	mtr)/*!< in: mtr */
 {
 ut_ad(rec_offs_validate(node_ptr, index, offsets));
@@ -829,10 +829,10 @@ Returns the upper level node pointer to a page. It is assumed that mtr holds
 an sx-latch on the tree.
 @return rec_get_offsets() of the node pointer record */
 static
-ulint*
+offset_t*
 btr_page_get_father_node_ptr_func(
 /*==============================*/
-ulint*offsets,/*!< in: work area for the return value */
+offset_t*offsets,/*!< in: work area for the return value */
 mem_heap_t*	heap,/*!< in: memory heap to use */
 btr_cur_t*	cursor,/*!< in: cursor pointing to user record,
 out: cursor on node pointer record,
@@ -936,10 +936,10 @@ Returns the upper level node pointer to a page. It is assumed that mtr holds
 an x-latch on the tree.
 @return rec_get_offsets() of the node pointer record */
 static
-ulint*
+offset_t*
 btr_page_get_father_block(
 /*======================*/
-ulint*offsets,/*!< in: work area for the return value */
+offset_t*offsets,/*!< in: work area for the return value */
 mem_heap_t*	heap,/*!< in: memory heap to use */
 dict_index_t*	index,/*!< in: b-tree index */
 buf_block_t*	block,/*!< in: child page in the index */
@@ -1823,7 +1823,7 @@ btr_root_raise_and_insert(
 on the root page; when the function returns,
 the cursor is positioned on the predecessor
 of the inserted record */
-ulint**offsets,/*!< out: offsets on inserted record */
+offset_t**offsets,/*!< out: offsets on inserted record */
 mem_heap_t**	heap,/*!< in/out: pointer to memory heap, or NULL */
 const dtuple_t*	tuple,/*!< in: tuple to insert */
 ulint	n_ext,/*!< in: number of externally stored columns */
@@ -2156,7 +2156,7 @@ btr_page_get_split_rec(
 rec_t*	next_rec;
 ulint	n;
 mem_heap_t*	heap;
-ulint*offsets;
+offset_t*offsets;
 
 page = btr_cur_get_page(cursor);
 
@@ -2262,7 +2262,7 @@ btr_page_insert_fits(
 const rec_t*	split_rec,/*!< in: suggestion for first record
 on upper half-page, or NULL if
 tuple to be inserted should be first */
-ulint**offsets,/*!< in: rec_get_offsets(
+offset_t**offsets,/*!< in: rec_get_offsets(
 split_rec, cursor->index); out: garbage */
 const dtuple_t*	tuple,/*!< in: tuple to insert */
 ulint	n_ext,/*!< in: number of externally stored columns */
@@ -2362,8 +2362,8 @@ btr_insert_on_non_leaf_level_func(
 dberr_terr;
 rec_t*	rec;
 mem_heap_t*	heap = NULL;
-ulint offsets_[REC_OFFS_NORMAL_SIZE];
-ulint* offsets = offsets_;
+offset_toffsets_[REC_OFFS_NORMAL_SIZE];
+offset_t*offsets = offsets_;
 rec_offs_init(offsets_);
 rtr_info_trtr_info;
 
@@ -2471,7 +2471,7 @@ btr_attach_half_pages(
 if (direction == FSP_DOWN) {
 
 btr_cur_tcursor;
-ulint*offsets;
+offset_t*offsets;
 
 lower_page = buf_block_get_frame(new_block);
 lower_page_no = new_block->page.id.page_no();
@@ -2593,7 +2593,7 @@ btr_page_tuple_smaller(
 /*===================*/
 btr_cur_t*	cursor,/*!< in: b-tree cursor */
 const dtuple_t*	tuple,/*!< in: tuple to consider */
-ulint**offsets,/*!< in/out: temporary storage */
+offset_t**offsets,/*!< in/out: temporary storage */
 ulint	n_uniq,/*!< in: number of unique fields
 in the index page records */
 mem_heap_t**	heap)/*!< in/out: heap for offsets */
@@ -2633,7 +2633,7 @@ rec_t*
 btr_insert_into_right_sibling(
 ulint	flags,
 btr_cur_t*	cursor,
-ulint**offsets,
+offset_t**offsets,
 mem_heap_t*	heap,
 const dtuple_t*	tuple,
 ulint	n_ext,
@@ -2769,7 +2769,7 @@ btr_page_split_and_insert(
 btr_cur_t*	cursor,/*!< in: cursor at which to insert; when the
 function returns, the cursor is positioned
 on the predecessor of the inserted record */
-ulint**offsets,/*!< out: offsets on inserted record */
+offset_t**offsets,/*!< out: offsets on inserted record */
 mem_heap_t**	heap,/*!< in/out: pointer to memory heap, or NULL */
 const dtuple_t*	tuple,/*!< in: tuple to insert */
 ulint	n_ext,/*!< in: number of externally stored columns */
@@ -3321,7 +3321,7 @@ btr_lift_page_up(
 
 {
 btr_cur_tcursor;
-ulint*offsets	= NULL;
+offset_t*offsets	= NULL;
 mem_heap_t*	heap	= mem_heap_create(
 sizeof(*offsets)
 * (REC_OFFS_HEADER_SIZE + 1 + 1
@@ -3518,7 +3518,7 @@ btr_compress(
 page_t*	page;
 btr_cur_tfather_cursor;
 mem_heap_t*	heap;
-ulint*offsets;
+offset_t*offsets;
 ulint	nth_rec = 0; /* remove bogus warning */
 boolmbr_changed = false;
 #ifdef UNIV_DEBUG
@@ -3661,7 +3661,7 @@ btr_compress(
 if (is_left) {
 btr_cur_tcursor2;
 rtr_mbr_tnew_mbr;
-ulint*offsets2 = NULL;
+offset_t*offsets2 = NULL;
 
 /* For rtree, we need to update father's mbr. */
 if (dict_index_is_spatial(index)) {
@@ -3857,7 +3857,7 @@ btr_compress(
 
 /* For rtree, we need to update father's mbr. */
 if (dict_index_is_spatial(index)) {
-ulint*offsets2;
+offset_t* offsets2;
 ulint	rec_info;
 
 offsets2 = rec_get_offsets(
@@ -4304,7 +4304,7 @@ btr_print_recursive(
 ulint	width,/*!< in: print this many entries from start
 and end */
 mem_heap_t**	heap,/*!< in/out: heap for rec_get_offsets() */
-ulint**offsets,/*!< in/out: buffer for rec_get_offsets() */
+offset_t**offsets,/*!< in/out: buffer for rec_get_offsets() */
 mtr_t*	mtr)/*!< in: mtr */
 {
 const page_t*	page	= buf_block_get_frame(block);
@@ -4368,8 +4368,8 @@ btr_print_index(
 mtr_tmtr;
 buf_block_t*	root;
 mem_heap_t*	heap	= NULL;
-ulintoffsets_[REC_OFFS_NORMAL_SIZE];
-ulint*offsets	= offsets_;
+offset_toffsets_[REC_OFFS_NORMAL_SIZE];
+offset_t*offsets	= offsets_;
 rec_offs_init(offsets_);
 
 fputs("--------------------------\n"
@@ -4403,7 +4403,7 @@ btr_check_node_ptr(
 {
 mem_heap_t*	heap;
 dtuple_t*	tuple;
-ulint*offsets;
+offset_t*offsets;
 btr_cur_tcursor;
 page_t*	page = buf_block_get_frame(block);
 
@@ -4483,8 +4483,8 @@ btr_index_rec_validate(
 ulint	len;
 const page_t*	page;
 mem_heap_t*	heap	= NULL;
-ulintoffsets_[REC_OFFS_NORMAL_SIZE];
-ulint*offsets	= offsets_;
+offset_toffsets_[REC_OFFS_NORMAL_SIZE];
+offset_t*offsets	= offsets_;
 rec_offs_init(offsets_);
 
 page = page_align(rec);
@@ -4716,8 +4716,8 @@ btr_validate_level(
 boolret	= true;
 mtr_tmtr;
 mem_heap_t*	heap	= mem_heap_create(256);
-ulint*offsets	= NULL;
-ulint*offsets2= NULL;
+offset_t*offsets	= NULL;
+offset_t*offsets2= NULL;
 #ifdef UNIV_ZIP_DEBUG
 page_zip_des_t*	page_zip;
 #endif /* UNIV_ZIP_DEBUG */

storage/innobase/btr/btr0bulk.cc

@@ -175,7 +175,7 @@ PageBulk::init()
 void
 PageBulk::insert(
 const rec_t*	rec,
-ulint*offsets)
+offset_t*offsets)
 {
 ulint	rec_size;
 
@@ -188,7 +188,7 @@ PageBulk::insert(
 /* Check whether records are in order. */
 if (!page_rec_is_infimum(m_cur_rec)) {
 rec_t*	old_rec = m_cur_rec;
-ulint*old_offsets = rec_get_offsets(
+offset_t* old_offsets = rec_get_offsets(
 old_rec, m_index, NULL,	is_leaf,
 ULINT_UNDEFINED, &m_heap);
 
@@ -401,7 +401,7 @@ rec_t*
 PageBulk::getSplitRec()
 {
 rec_t*	rec;
-ulint*offsets;
+offset_t*offsets;
 ulint	total_used_size;
 ulint	total_recs_size;
 ulint	n_recs;
@@ -447,7 +447,7 @@ PageBulk::copyIn(
 {
 
 rec_t*	rec = split_rec;
-ulint*offsets = NULL;
+offset_t*offsets = NULL;
 
 ut_ad(m_rec_no == 0);
 ut_ad(page_rec_is_user_rec(rec));
@@ -493,7 +493,7 @@ PageBulk::copyOut(
 ut_ad(n > 0);
 
 /* Set last record's next in page */
-ulint*offsets = NULL;
+offset_t*offsets = NULL;
 rec = page_rec_get_prev(split_rec);
 offsets = rec_get_offsets(rec, m_index, offsets,
  page_rec_is_leaf(split_rec),
@@ -602,7 +602,7 @@ the blob data is logged first, then the record is logged in bulk mode.
 dberr_t
 PageBulk::storeExt(
 const big_rec_t*	big_rec,
-ulint*offsets)
+offset_t*offsets)
 {
 /* Note: not all fileds are initialized in btr_pcur. */
 btr_pcur_tbtr_pcur;
@@ -862,7 +862,7 @@ BtrBulk::insert(
 ulint	rec_size = rec_get_converted_size(m_index, tuple, n_ext);
 big_rec_t*	big_rec = NULL;
 rec_t*	rec = NULL;
-ulint*offsets = NULL;
+offset_t*offsets = NULL;
 
 if (page_bulk->needExt(tuple, rec_size)) {
 /* The record is so big that we have to store some fields