diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-06 08:29:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-06 08:29:56 +0300 |
| commit | de078e060e9b967e8c243a93e461619d190e8786 (patch) | |
| tree | 489f693f7f04bc4db935d1c78ae952d65d8feedf /storage/innobase/btr/btr0pcur.cc | |
| parent | 2154a1fc3566e994601a05875fdb65bd6f6d7133 (diff) | |
| parent | 3708bef60683dc7b6020ee76e90738528ccad18a (diff) | |
| download | mariadb-git-de078e060e9b967e8c243a93e461619d190e8786.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/btr/btr0pcur.cc')
| -rw-r--r-- | storage/innobase/btr/btr0pcur.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc index 76d2be211f8..2d538d69d04 100644 --- a/storage/innobase/btr/btr0pcur.cc +++ b/storage/innobase/btr/btr0pcur.cc @@ -426,11 +426,7 @@ btr_pcur_t::restore_position(ulint restore_latch_mode, const char *file, } btr_pcur_open_with_no_init_func(index, tuple, mode, restore_latch_mode, - this, -#ifdef BTR_CUR_HASH_ADAPT - NULL, -#endif /* BTR_CUR_HASH_ADAPT */ - file, line, mtr); + this, file, line, mtr); /* Restore the old search mode */ search_mode = old_mode; |