diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-11 16:15:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-11 16:15:19 +0300 |
| commit | 5bada1246de48ef4a18fa30388f06719c971c3d7 (patch) | |
| tree | 65de1dc70eebfc94385afadb7202b86a009425c8 /storage/innobase/log/log0recv.cc | |
| parent | 375991a531f8885634e7a2af224bf396ee7e1f60 (diff) | |
| parent | fb72dfbf7fb52a4be12bad7f173baa71942fd558 (diff) | |
| download | mariadb-git-5bada1246de48ef4a18fa30388f06719c971c3d7.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/log/log0recv.cc')
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index d3d55a2138c..44b7e5b2a92 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -1241,7 +1241,7 @@ static void fil_name_process(const char *name, ulint len, uint32_t space_id, return; } - ut_ad(srv_operation == SRV_OPERATION_NORMAL + ut_ad(srv_operation <= SRV_OPERATION_EXPORT_RESTORED || srv_operation == SRV_OPERATION_RESTORE || srv_operation == SRV_OPERATION_RESTORE_EXPORT); @@ -3223,7 +3223,7 @@ static void log_sort_flush_list() @param last_batch whether it is possible to write more redo log */ void recv_sys_t::apply(bool last_batch) { - ut_ad(srv_operation == SRV_OPERATION_NORMAL || + ut_ad(srv_operation <= SRV_OPERATION_EXPORT_RESTORED || srv_operation == SRV_OPERATION_RESTORE || srv_operation == SRV_OPERATION_RESTORE_EXPORT); @@ -4104,7 +4104,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn) byte* buf; dberr_t err = DB_SUCCESS; - ut_ad(srv_operation == SRV_OPERATION_NORMAL + ut_ad(srv_operation <= SRV_OPERATION_EXPORT_RESTORED || srv_operation == SRV_OPERATION_RESTORE || srv_operation == SRV_OPERATION_RESTORE_EXPORT); ut_d(mysql_mutex_lock(&buf_pool.flush_list_mutex)); @@ -4315,7 +4315,7 @@ completed: recv_sys.parse_start_lsn = checkpoint_lsn; - if (srv_operation == SRV_OPERATION_NORMAL) { + if (srv_operation <= SRV_OPERATION_EXPORT_RESTORED) { deferred_spaces.deferred_dblwr(); buf_dblwr.recover(); } @@ -4380,7 +4380,8 @@ completed: log_sys.last_checkpoint_lsn = checkpoint_lsn; - if (!srv_read_only_mode && srv_operation == SRV_OPERATION_NORMAL + if (!srv_read_only_mode + && srv_operation <= SRV_OPERATION_EXPORT_RESTORED && (~log_t::FORMAT_ENCRYPTED & log_sys.log.format) == log_t::FORMAT_10_5) { /* Write a FILE_CHECKPOINT marker as the first thing, |