diff options
Diffstat (limited to 'storage/innobase/page')
| -rw-r--r-- | storage/innobase/page/page0cur.cc | 12 | ||||
| -rw-r--r-- | storage/innobase/page/page0zip.cc | 1 |
2 files changed, 5 insertions, 8 deletions
diff --git a/storage/innobase/page/page0cur.cc b/storage/innobase/page/page0cur.cc index df7d26c63e8..e5c903935f1 100644 --- a/storage/innobase/page/page0cur.cc +++ b/storage/innobase/page/page0cur.cc @@ -2060,14 +2060,10 @@ page_copy_rec_list_end_to_created_page( /* Individual inserts are logged in a shorter form */ - mtr_log_t log_mode; - - if (dict_table_is_temporary(index->table) - || index->table->ibd_file_missing /* IMPORT TABLESPACE */) { - log_mode = mtr_get_log_mode(mtr); - } else { - log_mode = mtr_set_log_mode(mtr, MTR_LOG_SHORT_INSERTS); - } + const mtr_log_t log_mode = dict_table_is_temporary(index->table) + || !index->is_readable() /* IMPORT TABLESPACE */ + ? mtr_get_log_mode(mtr) + : mtr_set_log_mode(mtr, MTR_LOG_SHORT_INSERTS); prev_rec = page_get_infimum_rec(new_page); if (page_is_comp(new_page)) { diff --git a/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc index e718081ed63..59022dbe301 100644 --- a/storage/innobase/page/page0zip.cc +++ b/storage/innobase/page/page0zip.cc @@ -4634,6 +4634,7 @@ page_zip_write_header_log( #if PAGE_DATA > 255 # error "PAGE_DATA > 255" #endif + ut_ad(length > 0); ut_ad(length < 256); /* If no logging is requested, we may return now */ |