diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
| commit | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (patch) | |
| tree | 0777df9a8dc587b70851c1edc0cfe96895928717 /storage/innobase/log/log0recv.cc | |
| parent | 6053eb1ce278ac1f566cd74498506bf457d6d048 (diff) | |
| parent | f35d1721039f8f115fc55e8f4b4d2bb4012161d1 (diff) | |
| download | mariadb-git-66ec3a770f7854f500ece66c78f3c87c9cd6da15.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/log/log0recv.cc')
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 93adfdd7587..bb83c38704f 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -2876,8 +2876,9 @@ loop: if (lsn == checkpoint_lsn) { if (recv_sys->mlog_checkpoint_lsn) { - ut_ad(recv_sys->mlog_checkpoint_lsn - <= recv_sys->recovered_lsn); + /* There can be multiple + MLOG_CHECKPOINT lsn for the + same checkpoint. */ break; } recv_sys->mlog_checkpoint_lsn |