@@ -777,7 +777,7 @@ btr_node_ptr_set_child_page_no(
777
777
rec_t * rec, /* !< in: node pointer record */
778
778
page_zip_des_t * page_zip,/* !< in/out: compressed page whose uncompressed
779
779
part will be updated, or NULL */
780
- const offset_t * offsets,/* !< in: array returned by rec_get_offsets() */
780
+ const rec_offs * offsets,/* !< in: array returned by rec_get_offsets() */
781
781
ulint page_no,/* !< in: child node address */
782
782
mtr_t * mtr) /* !< in: mtr */
783
783
{
@@ -812,7 +812,7 @@ btr_node_ptr_get_child(
812
812
/* ===================*/
813
813
const rec_t * node_ptr,/* !< in: node pointer */
814
814
dict_index_t * index, /* !< in: index */
815
- const offset_t * offsets,/* !< in: array returned by rec_get_offsets() */
815
+ const rec_offs * offsets,/* !< in: array returned by rec_get_offsets() */
816
816
mtr_t * mtr) /* !< in: mtr */
817
817
{
818
818
ut_ad (rec_offs_validate (node_ptr, index, offsets));
@@ -830,10 +830,10 @@ Returns the upper level node pointer to a page. It is assumed that mtr holds
830
830
an sx-latch on the tree.
831
831
@return rec_get_offsets() of the node pointer record */
832
832
static
833
- offset_t *
833
+ rec_offs *
834
834
btr_page_get_father_node_ptr_func (
835
835
/* ==============================*/
836
- offset_t * offsets,/* !< in: work area for the return value */
836
+ rec_offs * offsets,/* !< in: work area for the return value */
837
837
mem_heap_t * heap, /* !< in: memory heap to use */
838
838
btr_cur_t * cursor, /* !< in: cursor pointing to user record,
839
839
out: cursor on node pointer record,
@@ -937,10 +937,10 @@ Returns the upper level node pointer to a page. It is assumed that mtr holds
937
937
an x-latch on the tree.
938
938
@return rec_get_offsets() of the node pointer record */
939
939
static
940
- offset_t *
940
+ rec_offs *
941
941
btr_page_get_father_block(
942
942
/* ======================*/
943
- offset_t * offsets,/* !< in: work area for the return value */
943
+ rec_offs * offsets,/* !< in: work area for the return value */
944
944
mem_heap_t * heap, /* !< in: memory heap to use */
945
945
dict_index_t * index, /* !< in: b-tree index */
946
946
buf_block_t * block, /* !< in: child page in the index */
@@ -1814,7 +1814,7 @@ btr_root_raise_and_insert(
1814
1814
on the root page; when the function returns,
1815
1815
the cursor is positioned on the predecessor
1816
1816
of the inserted record */
1817
- offset_t ** offsets,/* !< out: offsets on inserted record */
1817
+ rec_offs ** offsets,/* !< out: offsets on inserted record */
1818
1818
mem_heap_t ** heap, /* !< in/out: pointer to memory heap, or NULL */
1819
1819
const dtuple_t * tuple, /* !< in: tuple to insert */
1820
1820
ulint n_ext, /* !< in: number of externally stored columns */
@@ -2125,7 +2125,7 @@ btr_page_get_split_rec(
2125
2125
rec_t * next_rec;
2126
2126
ulint n;
2127
2127
mem_heap_t * heap;
2128
- offset_t * offsets;
2128
+ rec_offs * offsets;
2129
2129
2130
2130
page = btr_cur_get_page (cursor);
2131
2131
@@ -2231,7 +2231,7 @@ btr_page_insert_fits(
2231
2231
const rec_t * split_rec,/* !< in: suggestion for first record
2232
2232
on upper half-page, or NULL if
2233
2233
tuple to be inserted should be first */
2234
- offset_t ** offsets,/* !< in: rec_get_offsets(
2234
+ rec_offs ** offsets,/* !< in: rec_get_offsets(
2235
2235
split_rec, cursor->index); out: garbage */
2236
2236
const dtuple_t * tuple, /* !< in: tuple to insert */
2237
2237
ulint n_ext, /* !< in: number of externally stored columns */
@@ -2331,8 +2331,8 @@ btr_insert_on_non_leaf_level_func(
2331
2331
dberr_t err;
2332
2332
rec_t * rec;
2333
2333
mem_heap_t * heap = NULL ;
2334
- offset_t offsets_[REC_OFFS_NORMAL_SIZE];
2335
- offset_t * offsets = offsets_;
2334
+ rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
2335
+ rec_offs * offsets = offsets_;
2336
2336
rec_offs_init (offsets_);
2337
2337
rtr_info_t rtr_info;
2338
2338
@@ -2441,7 +2441,7 @@ btr_attach_half_pages(
2441
2441
if (direction == FSP_DOWN) {
2442
2442
2443
2443
btr_cur_t cursor;
2444
- offset_t * offsets;
2444
+ rec_offs * offsets;
2445
2445
2446
2446
lower_page = buf_block_get_frame (new_block);
2447
2447
lower_page_no = new_block->page .id .page_no ();
@@ -2564,7 +2564,7 @@ btr_page_tuple_smaller(
2564
2564
/* ===================*/
2565
2565
btr_cur_t * cursor, /* !< in: b-tree cursor */
2566
2566
const dtuple_t * tuple, /* !< in: tuple to consider */
2567
- offset_t ** offsets,/* !< in/out: temporary storage */
2567
+ rec_offs ** offsets,/* !< in/out: temporary storage */
2568
2568
ulint n_uniq, /* !< in: number of unique fields
2569
2569
in the index page records */
2570
2570
mem_heap_t ** heap) /* !< in/out: heap for offsets */
@@ -2604,7 +2604,7 @@ rec_t*
2604
2604
btr_insert_into_right_sibling (
2605
2605
ulint flags,
2606
2606
btr_cur_t * cursor,
2607
- offset_t ** offsets,
2607
+ rec_offs ** offsets,
2608
2608
mem_heap_t * heap,
2609
2609
const dtuple_t * tuple,
2610
2610
ulint n_ext,
@@ -2741,7 +2741,7 @@ btr_page_split_and_insert(
2741
2741
btr_cur_t * cursor, /* !< in: cursor at which to insert; when the
2742
2742
function returns, the cursor is positioned
2743
2743
on the predecessor of the inserted record */
2744
- offset_t ** offsets,/* !< out: offsets on inserted record */
2744
+ rec_offs ** offsets,/* !< out: offsets on inserted record */
2745
2745
mem_heap_t ** heap, /* !< in/out: pointer to memory heap, or NULL */
2746
2746
const dtuple_t * tuple, /* !< in: tuple to insert */
2747
2747
ulint n_ext, /* !< in: number of externally stored columns */
@@ -3302,7 +3302,7 @@ btr_lift_page_up(
3302
3302
3303
3303
{
3304
3304
btr_cur_t cursor;
3305
- offset_t * offsets = NULL ;
3305
+ rec_offs * offsets = NULL ;
3306
3306
mem_heap_t * heap = mem_heap_create (
3307
3307
sizeof (*offsets)
3308
3308
* (REC_OFFS_HEADER_SIZE + 1 + 1 + index->n_fields ));
@@ -3487,7 +3487,7 @@ btr_compress(
3487
3487
page_t * page;
3488
3488
btr_cur_t father_cursor;
3489
3489
mem_heap_t * heap;
3490
- offset_t * offsets;
3490
+ rec_offs * offsets;
3491
3491
ulint nth_rec = 0 ; /* remove bogus warning */
3492
3492
bool mbr_changed = false ;
3493
3493
#ifdef UNIV_DEBUG
@@ -3631,7 +3631,7 @@ btr_compress(
3631
3631
if (is_left) {
3632
3632
btr_cur_t cursor2;
3633
3633
rtr_mbr_t new_mbr;
3634
- offset_t * offsets2 = NULL ;
3634
+ rec_offs * offsets2 = NULL ;
3635
3635
3636
3636
/* For rtree, we need to update father's mbr. */
3637
3637
if (dict_index_is_spatial (index)) {
@@ -3829,7 +3829,7 @@ btr_compress(
3829
3829
3830
3830
/* For rtree, we need to update father's mbr. */
3831
3831
if (dict_index_is_spatial (index)) {
3832
- offset_t * offsets2;
3832
+ rec_offs * offsets2;
3833
3833
ulint rec_info;
3834
3834
3835
3835
offsets2 = rec_get_offsets (
@@ -4276,7 +4276,7 @@ btr_print_recursive(
4276
4276
ulint width, /* !< in: print this many entries from start
4277
4277
and end */
4278
4278
mem_heap_t ** heap, /* !< in/out: heap for rec_get_offsets() */
4279
- offset_t ** offsets,/* !< in/out: buffer for rec_get_offsets() */
4279
+ rec_offs ** offsets,/* !< in/out: buffer for rec_get_offsets() */
4280
4280
mtr_t * mtr) /* !< in: mtr */
4281
4281
{
4282
4282
const page_t * page = buf_block_get_frame (block);
@@ -4340,8 +4340,8 @@ btr_print_index(
4340
4340
mtr_t mtr;
4341
4341
buf_block_t * root;
4342
4342
mem_heap_t * heap = NULL ;
4343
- offset_t offsets_[REC_OFFS_NORMAL_SIZE];
4344
- offset_t * offsets = offsets_;
4343
+ rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
4344
+ rec_offs * offsets = offsets_;
4345
4345
rec_offs_init (offsets_);
4346
4346
4347
4347
fputs (" --------------------------\n "
@@ -4375,7 +4375,7 @@ btr_check_node_ptr(
4375
4375
{
4376
4376
mem_heap_t * heap;
4377
4377
dtuple_t * tuple;
4378
- offset_t * offsets;
4378
+ rec_offs * offsets;
4379
4379
btr_cur_t cursor;
4380
4380
page_t * page = buf_block_get_frame (block);
4381
4381
@@ -4457,8 +4457,8 @@ btr_index_rec_validate(
4457
4457
ulint i;
4458
4458
const page_t * page;
4459
4459
mem_heap_t * heap = NULL ;
4460
- offset_t offsets_[REC_OFFS_NORMAL_SIZE];
4461
- offset_t * offsets = offsets_;
4460
+ rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
4461
+ rec_offs * offsets = offsets_;
4462
4462
rec_offs_init (offsets_);
4463
4463
4464
4464
page = page_align (rec);
@@ -4691,8 +4691,8 @@ btr_validate_level(
4691
4691
bool ret = true ;
4692
4692
mtr_t mtr;
4693
4693
mem_heap_t * heap = mem_heap_create (256 );
4694
- offset_t * offsets = NULL ;
4695
- offset_t * offsets2= NULL ;
4694
+ rec_offs * offsets = NULL ;
4695
+ rec_offs * offsets2= NULL ;
4696
4696
#ifdef UNIV_ZIP_DEBUG
4697
4697
page_zip_des_t * page_zip;
4698
4698
#endif /* UNIV_ZIP_DEBUG */
0 commit comments