summaryrefslogtreecommitdiff
path: root/storage/innobase/btr/btr0defragment.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-13 10:08:57 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-13 10:08:57 +0200
commit3466b47b0d2f0aca0a2191574c593c7eaea0b0b8 (patch)
tree883e5c638ae861638582aba6e6534377e2564706 /storage/innobase/btr/btr0defragment.cc
parent0a20e5ab77f8a6532b41ea2518626397059ccf42 (diff)
parentf0aa073f2bf3d8d85b3d028df89cdb4cdfc4002d (diff)
downloadmariadb-git-3466b47b0d2f0aca0a2191574c593c7eaea0b0b8.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/btr/btr0defragment.cc')
-rw-r--r--storage/innobase/btr/btr0defragment.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/btr/btr0defragment.cc b/storage/innobase/btr/btr0defragment.cc
index 39007c34258..dd8a2546691 100644
--- a/storage/innobase/btr/btr0defragment.cc
+++ b/storage/innobase/btr/btr0defragment.cc
@@ -338,8 +338,8 @@ btr_defragment_calc_n_recs_for_size(
{
page_t* page = buf_block_get_frame(block);
ulint n_recs = 0;
- ulint offsets_[REC_OFFS_NORMAL_SIZE];
- ulint* offsets = offsets_;
+ offset_t offsets_[REC_OFFS_NORMAL_SIZE];
+ offset_t* offsets = offsets_;
rec_offs_init(offsets_);
mem_heap_t* heap = NULL;
ulint size = 0;