diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-08 08:22:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-08 08:22:34 +0300 |
| commit | d8303c3ee7750f4003e3561c3e60ee6e636bf9ad (patch) | |
| tree | e4e8bb9a850836859974be09bf8cf524ea21491c /storage/innobase/btr/btr0bulk.cc | |
| parent | a2afba8b01c249971f600a82f1a9b0a119374b9a (diff) | |
| parent | cc492bfd4ff2d15cc5803a7d80f1559ceeb003c1 (diff) | |
| download | mariadb-git-d8303c3ee7750f4003e3561c3e60ee6e636bf9ad.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/btr/btr0bulk.cc')
| -rw-r--r-- | storage/innobase/btr/btr0bulk.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/btr/btr0bulk.cc b/storage/innobase/btr/btr0bulk.cc index 9cad745aa0d..e9b64ebdef3 100644 --- a/storage/innobase/btr/btr0bulk.cc +++ b/storage/innobase/btr/btr0bulk.cc @@ -663,11 +663,11 @@ PageBulk::latch() /* In case the block is S-latched by page_cleaner. */ 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), - m_index->table->space->zip_size(), - RW_X_LATCH, m_block, BUF_GET_IF_IN_POOL, - __FILE__, __LINE__, &m_mtr, &m_err); + m_block = buf_page_get_gen(page_id_t(m_index->table->space_id, + m_page_no), + 0, RW_X_LATCH, + m_block, BUF_GET_IF_IN_POOL, + __FILE__, __LINE__, &m_mtr, &m_err); if (m_err != DB_SUCCESS) { return (m_err); |