summaryrefslogtreecommitdiff
path: root/storage/innobase/btr/btr0defragment.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-16 07:47:17 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-16 07:47:17 +0200
commit28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch)
treece50324e5d1054f59a7178bfdb426189998baf52 /storage/innobase/btr/btr0defragment.cc
parent745fd4b39f8aff6300682502ed2ddf61ee343866 (diff)
parent8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff)
downloadmariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz
Merge 10.4 into 10.5
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 300d66456e6..bae0731013c 100644
--- a/storage/innobase/btr/btr0defragment.cc
+++ b/storage/innobase/btr/btr0defragment.cc
@@ -367,8 +367,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;