diff options
Diffstat (limited to 'storage/innobase/btr/btr0bulk.cc')
| -rw-r--r-- | storage/innobase/btr/btr0bulk.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/innobase/btr/btr0bulk.cc b/storage/innobase/btr/btr0bulk.cc index 73b4335d265..09f31259e8e 100644 --- a/storage/innobase/btr/btr0bulk.cc +++ b/storage/innobase/btr/btr0bulk.cc @@ -120,7 +120,7 @@ PageBulk::init() } } else { new_block = btr_block_get( - page_id_t(m_index->table->space->id, m_page_no), + page_id_t(m_index->table->space_id, m_page_no), page_size_t(m_index->table->space->flags), RW_X_LATCH, m_index, &m_mtr); @@ -663,7 +663,7 @@ PageBulk::latch() if (!buf_page_optimistic_get(RW_X_LATCH, m_block, m_modify_clock, __FILE__, __LINE__, &m_mtr)) { m_block = buf_page_get_gen( - page_id_t(m_index->table->space->id, m_page_no), + page_id_t(m_index->table->space_id, m_page_no), page_size_t(m_index->table->space->flags), RW_X_LATCH, m_block, BUF_GET_IF_IN_POOL, __FILE__, __LINE__, &m_mtr, &m_err); @@ -833,6 +833,7 @@ BtrBulk::insert( level, m_flush_observer)); err = new_page_bulk->init(); if (err != DB_SUCCESS) { + UT_DELETE(new_page_bulk); return(err); } @@ -1015,7 +1016,7 @@ BtrBulk::finish(dberr_t err) ut_ad(last_page_no != FIL_NULL); last_block = btr_block_get( - page_id_t(m_index->table->space->id, last_page_no), + page_id_t(m_index->table->space_id, last_page_no), page_size_t(m_index->table->space->flags), RW_X_LATCH, m_index, &mtr); first_rec = page_rec_get_next( @@ -1044,6 +1045,6 @@ BtrBulk::finish(dberr_t err) ut_ad(!sync_check_iterate(dict_sync_check())); - ut_ad(err != DB_SUCCESS || btr_validate_index(m_index, NULL, false)); + ut_ad(err != DB_SUCCESS || btr_validate_index(m_index, NULL)); return(err); } |