diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-11 11:25:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-11 11:25:33 +0200 |
| commit | fd132be117e44318de04973e8bc825651b220792 (patch) | |
| tree | a78222eeae060b5a605633a9f603e5e7528f12c3 /storage/innobase/btr/btr0cur.cc | |
| parent | 7b05fc5cdd6058e91a26836ace54f45f37fa88b5 (diff) | |
| parent | a917be3e7f07fc803fb04aba7173081550dcc7db (diff) | |
| download | mariadb-git-fd132be117e44318de04973e8bc825651b220792.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'storage/innobase/btr/btr0cur.cc')
| -rw-r--r-- | storage/innobase/btr/btr0cur.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index d7cc8fd2115..c55e50ca32a 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -5811,7 +5811,6 @@ discard_page: rec_t* father_rec; btr_cur_t father_cursor; rec_offs* offsets; - bool upd_ret; ulint len; rtr_page_get_father_block(NULL, heap, index, @@ -5825,17 +5824,8 @@ discard_page: rtr_read_mbr(rec_get_nth_field( father_rec, offsets, 0, &len), &father_mbr); - upd_ret = rtr_update_mbr_field(&father_cursor, offsets, - NULL, page, &father_mbr, - next_rec, mtr); - - if (!upd_ret) { - *err = DB_ERROR; - - mem_heap_free(heap); - return(FALSE); - } - + rtr_update_mbr_field(&father_cursor, offsets, NULL, + page, &father_mbr, next_rec, mtr); ut_d(parent_latched = true); } else { /* Otherwise, if we delete the leftmost node pointer |