Skip to content

MDEV-40667 Infinite loop on SET GLOBAL innodb_log_archive=ON #5511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dr-m wants to merge 1 commit into
base: 13.0
Choose a base branch
from
+3 −2
Open

MDEV-40667 Infinite loop on SET GLOBAL innodb_log_archive=ON #5511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions storage/innobase/log/log0log.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,14 +811,15 @@ void log_t::set_archive(my_bool archive, THD *thd) noexcept

if (archive)
{
wait_lsn-= (wait_lsn - first_lsn) % capacity();
const lsn_t limit{wait_lsn - (wait_lsn - first_lsn) % capacity()};
/* We are in innodb_log_archive=OFF. If the file has wrapped
around between the checkpoint and the current position, we must
wait for a log checkpoint not before the desired first_lsn of
our innodb_log_archive=ON log file, because that format does not
allow any wrap-around. */
if (checkpoint < wait_lsn)
if (checkpoint < limit)
goto retry_after_checkpoint;
wait_lsn= limit;
}
else if (circular_recovery_from_sequence_bit_0)
{
Expand Down