Merge 10.2 into 10.3

This commit is contained in:
Marko Mäkelä 2021-04-09 14:32:06 +03:00
commit 450c017c2d
35 changed files with 439 additions and 42 deletions

View file

@ -2108,7 +2108,7 @@ files_checked:
to the data files and truncate or delete the log.
Unless --export is specified, no further change to
InnoDB files is needed. */
ut_ad(!srv_force_recovery);
ut_ad(srv_force_recovery <= SRV_FORCE_IGNORE_CORRUPT);
ut_ad(srv_n_log_files_found <= 1);
ut_ad(recv_no_log_write);
buf_flush_sync_all_buf_pools();