diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-03 18:41:18 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-03 18:41:18 -0800 |
| commit | 37deed3f37561f264f65e162146bbc2ad35fb1a2 (patch) | |
| tree | c1cfb6c0995bfcc4ac3fb335f518a8b404413e32 /storage/innobase/gis/gis0rtree.cc | |
| parent | 658128af43b4d7c6db445164f8ed25ed4d1e3109 (diff) | |
| parent | 5b996782be6b752ce50a0ecaa222b0688aa9e75d (diff) | |
| download | mariadb-git-37deed3f37561f264f65e162146bbc2ad35fb1a2.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev16188
Diffstat (limited to 'storage/innobase/gis/gis0rtree.cc')
| -rw-r--r-- | storage/innobase/gis/gis0rtree.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc index 4bd3e1c232a..9c10108a3f3 100644 --- a/storage/innobase/gis/gis0rtree.cc +++ b/storage/innobase/gis/gis0rtree.cc @@ -737,7 +737,7 @@ rtr_adjust_upper_level( new_prdt.op = 0; lock_prdt_update_parent(block, new_block, &prdt, &new_prdt, - index->table->space->id, + index->table->space_id, page_cursor->block->page.id.page_no()); mem_heap_free(heap); @@ -746,14 +746,15 @@ rtr_adjust_upper_level( prev_page_no = btr_page_get_prev(page, mtr); next_page_no = btr_page_get_next(page, mtr); space = block->page.id.space(); - const page_size_t& page_size = dict_table_page_size(index->table); + ut_ad(block->page.size.equals_to(dict_table_page_size(index->table))); /* Update page links of the level */ if (prev_page_no != FIL_NULL) { page_id_t prev_page_id(space, prev_page_no); buf_block_t* prev_block = btr_block_get( - prev_page_id, page_size, RW_X_LATCH, index, mtr); + prev_page_id, block->page.size, RW_X_LATCH, + index, mtr); #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(prev_block->frame) == page_is_comp(page)); ut_a(btr_page_get_next(prev_block->frame, mtr) @@ -769,7 +770,8 @@ rtr_adjust_upper_level( page_id_t next_page_id(space, next_page_no); buf_block_t* next_block = btr_block_get( - next_page_id, page_size, RW_X_LATCH, index, mtr); + next_page_id, block->page.size, RW_X_LATCH, + index, mtr); #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(next_block->frame) == page_is_comp(page)); ut_a(btr_page_get_prev(next_block->frame, mtr) @@ -1258,7 +1260,7 @@ after_insert: /* Check any predicate locks need to be moved/copied to the new page */ lock_prdt_update_split(new_block, &prdt, &new_prdt, - cursor->index->table->space->id, page_no); + cursor->index->table->space_id, page_no); /* Adjust the upper level. */ rtr_adjust_upper_level(cursor, flags, block, new_block, @@ -1872,7 +1874,7 @@ rtr_estimate_n_rows_in_range( mtr_s_lock(&index->lock, &mtr); buf_block_t* block = btr_block_get( - page_id_t(index->table->space->id, index->page), + page_id_t(index->table->space_id, index->page), page_size_t(index->table->space->flags), RW_S_LATCH, index, &mtr); const page_t* page = buf_block_get_frame(block); |