mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +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ä 2022-01-18 12:59:50 +02:00
commit 1abc476f0b
17 changed files with 205 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/log/log0recv.cc
View file

@ -2212,9 +2212,7 @@ eom_found:
#endif
uint32_t space_id= 0, page_no= 0, last_offset= 0;
#if 1 /* MDEV-14425 FIXME: remove this */
bool got_page_op= false;
#endif
for (l= log; l < end; l+= rlen)
{
const byte *const recs= l;
@ -2484,11 +2482,9 @@ same_page:
pages.erase(i);
}
}
#if 1 /* MDEV-14425 FIXME: this must be in the checkpoint file only! */
else if (rlen)
{
switch (b & 0xf0) {
# if 1 /* MDEV-14425 FIXME: Remove this! */
case FILE_CHECKPOINT:
if (space_id == 0 && page_no == 0 && rlen == 8)
{
@ -2519,7 +2515,6 @@ same_page:
}
continue;
}
# endif
/* fall through */
default:
if (!srv_force_recovery)
@ -2598,7 +2593,6 @@ same_page:
return true;
}
}
#endif
else
goto malformed;
}