diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-20 10:18:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-20 10:18:52 +0300 |
| commit | 891bf1d8ce0b35045db68c203789d2043cabeb11 (patch) | |
| tree | 6b115dc5f73c1a67772a287edd030c157eba6496 | |
| parent | f774c33a9dac492d493fac2fd432ce6e11a37973 (diff) | |
| parent | 70fffc7090676d229919aa24fb8f829cb6e8b158 (diff) | |
| download | mariadb-git-891bf1d8ce0b35045db68c203789d2043cabeb11.tar.gz | |
Merge 10.9 into 10.10
| -rw-r--r-- | plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc b/plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc index 629cae09865..730707ff52b 100644 --- a/plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc +++ b/plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc @@ -26,7 +26,7 @@ #ifdef _WIN32 #include <malloc.h> #define alloca _alloca -#elif !defined(__FreeBSD__) +#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) #include <alloca.h> #endif #include <algorithm> diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 171afa1f23c..df8e6376371 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -2918,7 +2918,7 @@ static buf_block_t *recv_recover_page(buf_block_t *block, mtr_t &mtr, const log_phys_t* l = static_cast<const log_phys_t*>(recv); ut_ad(l->lsn); ut_ad(end_lsn <= l->lsn); - ut_ad(l->lsn <= log_sys.get_lsn()); + ut_ad(l->lsn <= recv_sys.lsn); ut_ad(l->start_lsn); ut_ad(recv_start_lsn <= l->start_lsn); @@ -3561,13 +3561,11 @@ next_free_block: if (last_batch && srv_operation != SRV_OPERATION_RESTORE && srv_operation != SRV_OPERATION_RESTORE_EXPORT) + /* Instead of flushing, last_batch sorts the buf_pool.flush_list + in ascending order of buf_page_t::oldest_modification. */ log_sort_flush_list(); else - { - /* Instead of flushing, last_batch could sort the buf_pool.flush_list - in ascending order of buf_page_t::oldest_modification. */ buf_flush_sync_batch(lsn); - } if (!last_batch) { @@ -3738,7 +3736,6 @@ static bool recv_scan_log(bool last_phase) else { ut_ad(store == STORE_IF_EXISTS); - log_sys.set_recovered_lsn(recv_sys.lsn); recv_sys.apply(false); } } |