Skip to content

M
MariaDB
Commit 694ce0d0 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.5 into 10.6

parents 49308383 84dbd025
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/innobase/log/log0recv.cc
View file @ 694ce0d0
...@@ -2613,9 +2613,9 @@ bool recv_sys_t::parse(lsn_t checkpoint_lsn, store_t *store, bool apply) ...@@ -2613,9 +2613,9 @@ bool recv_sys_t::parse(lsn_t checkpoint_lsn, store_t *store, bool apply)
TRX_SYS_MAX_UNDO_SPACES, "compatibility"); TRX_SYS_MAX_UNDO_SPACES, "compatibility");
/* The entire undo tablespace will be reinitialized by /* The entire undo tablespace will be reinitialized by
innodb_undo_log_truncate=ON. Discard old log for all pages. */ innodb_undo_log_truncate=ON. Discard old log for all pages. */
trim({space_id, 0}, recovered_lsn); trim({space_id, 0}, start_lsn);
truncated_undo_spaces[space_id - srv_undo_space_id_start]= truncated_undo_spaces[space_id - srv_undo_space_id_start]=
{ recovered_lsn, page_no }; { start_lsn, page_no };
if (undo_space_trunc) if (undo_space_trunc)
undo_space_trunc(space_id); undo_space_trunc(space_id);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7