mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2024-01-17 13:35:05 +02:00
commit 3a96eba25f
51 changed files with 973 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

11
storage/innobase/buf/buf0dblwr.cc
View file

@ -338,11 +338,14 @@ func_exit:
os_file_flush(file);
}
else
for (ulint i= 0; i < size * 2; i++, page += srv_page_size)
if (mach_read_from_8(my_assume_aligned<8>(page + FIL_PAGE_LSN)))
/* Each valid page header must contain a nonzero FIL_PAGE_LSN field. */
{
alignas(8) char checkpoint[8];
mach_write_to_8(checkpoint, log_sys.next_checkpoint_lsn);
for (auto i= size * 2; i--; page += srv_page_size)
if (memcmp_aligned<8>(page + FIL_PAGE_LSN, checkpoint, 8) >= 0)
/* Valid pages are not older than the log checkpoint. */
recv_sys.dblwr.add(page);
}
err= DB_SUCCESS;
goto func_exit;
}