diff options
| -rw-r--r-- | storage/innobase/include/trx0trx.h | 2 | ||||
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index b2fe4266e7b..83fe07a48a4 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -1092,7 +1092,7 @@ public: @return DB_SUCCESS or error code */ dberr_t bulk_insert_apply() { - if (!bulk_insert) + if (UNIV_LIKELY(!bulk_insert)) return DB_SUCCESS; ut_ad(!check_unique_secondary); ut_ad(!check_foreigns); diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index adb3a3f4c49..6b3f0820d32 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -5156,7 +5156,8 @@ dberr_t row_merge_bulk_t::write_to_index(ulint index_no, trx_t *trx) { dberr_t err= DB_SUCCESS; row_merge_buf_t buf= m_merge_buf[index_no]; - merge_file_t *file= &m_merge_files[index_no]; + merge_file_t *file= m_merge_files ? + &m_merge_files[index_no] : nullptr; dict_index_t *index= buf.index; dict_table_t *table= index->table; BtrBulk btr_bulk(index, trx); |