diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-01 18:37:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-01 18:37:15 +0300 |
| commit | 9c16460e63a5002d5949f67f57dce71e666547ec (patch) | |
| tree | bb29fe94f869d828ed5768dbc72021d1911e2831 /storage/innobase/btr/btr0btr.cc | |
| parent | 747dccfe23e46b928b005669124e7ad94a1fdefb (diff) | |
| parent | 0e1ba364a12b6569c75a7dadc38b7ef2b4910d34 (diff) | |
| download | mariadb-git-9c16460e63a5002d5949f67f57dce71e666547ec.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/btr/btr0btr.cc')
| -rw-r--r-- | storage/innobase/btr/btr0btr.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc index 2c93077e0d2..d6eff63b360 100644 --- a/storage/innobase/btr/btr0btr.cc +++ b/storage/innobase/btr/btr0btr.cc @@ -3494,7 +3494,8 @@ btr_lift_page_up( /* btr_page_empty() is supposed to zero-initialize the field. */ ut_ad(!page_get_instant(father_block->frame)); - if (page_level == 0 && index->is_instant()) { + if (index->is_instant() + && father_block->page.id.page_no() == root_page_no) { ut_ad(!father_page_zip); btr_set_instant(father_block, *index, mtr); } |