diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 10:08:57 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 10:08:57 +0200 |
commit | 3466b47b0d2f0aca0a2191574c593c7eaea0b0b8 (patch) | |
tree | 883e5c638ae861638582aba6e6534377e2564706 /storage/innobase/btr/btr0scrub.cc | |
parent | 0a20e5ab77f8a6532b41ea2518626397059ccf42 (diff) | |
parent | f0aa073f2bf3d8d85b3d028df89cdb4cdfc4002d (diff) | |
download | mariadb-git-3466b47b0d2f0aca0a2191574c593c7eaea0b0b8.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/btr/btr0scrub.cc')
-rw-r--r-- | storage/innobase/btr/btr0scrub.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/btr/btr0scrub.cc b/storage/innobase/btr/btr0scrub.cc index 975520220c0..b0d1c91e5d8 100644 --- a/storage/innobase/btr/btr0scrub.cc +++ b/storage/innobase/btr/btr0scrub.cc @@ -478,7 +478,7 @@ btr_pessimistic_scrub( /* arguments to btr_page_split_and_insert */ mem_heap_t* heap = NULL; dtuple_t* entry = NULL; - ulint* offsets = NULL; + offset_t* offsets = NULL; ulint n_ext = 0; ulint flags = BTR_MODIFY_TREE; |