Merge 10.5 into 10.6

storage/innobase/log/log0recv.cc

@@ -2613,9 +2613,9 @@ bool recv_sys_t::parse(lsn_t checkpoint_lsn, store_t *store, bool apply)
                         TRX_SYS_MAX_UNDO_SPACES, "compatibility");
           /* The entire undo tablespace will be reinitialized by
           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]=
-            { recovered_lsn, page_no };
+            { start_lsn, page_no };
           if (undo_space_trunc)
             undo_space_trunc(space_id);
 #endif