Merge 10.2 into 10.3

except commit 1288dfffe7
This commit is contained in:
Marko Mäkelä 2021-04-24 10:37:21 +03:00
commit c425d93b92
16 changed files with 362 additions and 199 deletions

View file

@ -960,7 +960,8 @@ fail:
DBUG_EXECUTE_IF("log_checksum_mismatch", { cksum = crc + 1; });
if (crc != cksum) {
ib::error() << "Invalid log block checksum."
ib::error_or_warn(srv_operation != SRV_OPERATION_BACKUP)
<< "Invalid log block checksum."
<< " block: " << block_number
<< " checkpoint no: "
<< log_block_get_checkpoint_no(buf)