diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-28 11:25:21 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-28 11:25:21 +0300 |
commit | 4ce6e78059c1a91765c91afa5330737bd7568d0a (patch) | |
tree | 94e684c003fa5e171e62bc59178b72ae107b2ba9 /storage/innobase/log/log0log.cc | |
parent | 0149abf66ff8fd7893cd24cd7381ea5e59f6b91b (diff) | |
parent | f53f64b7b9edaef8e413add322225dc33ebc8131 (diff) | |
download | mariadb-git-4ce6e78059c1a91765c91afa5330737bd7568d0a.tar.gz |
Merge 10.9 into 10.10
Diffstat (limited to 'storage/innobase/log/log0log.cc')
-rw-r--r-- | storage/innobase/log/log0log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index cdc05e040fb..bed39837a0f 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -209,7 +209,7 @@ void log_t::attach(log_file_t file, os_offset_t size) #ifdef HAVE_PMEM ut_ad(!buf); ut_ad(!flush_buf); - if (size && !(size_t(size) & 4095)) + if (size && !(size_t(size) & 4095) && srv_operation != SRV_OPERATION_BACKUP) { void *ptr= log_mmap(log.m_file, size); if (ptr != MAP_FAILED) |