Skip to content

MDEV-40545 mariadb-binlog --force-read loops on truncated events #5784

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

Merged
ParadoxV5 merged 3 commits into from
Oct 23, 2026
Merged

MDEV-40545 mariadb-binlog --force-read loops on truncated events #5784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0589ace
MDEV-40545 mariadb-binlog --force-read loops on truncated events
GoldenEmperor1177 Oct 12, 2026
698dbf8
Merge branch '11.4' into MDEV-40545
GoldenEmperor1177 Oct 22, 2026
6f0e597
Merge branch '11.4' into MDEV-40545
ParadoxV5 Oct 23, 2026
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
18 changes: 18 additions & 0 deletions mysql-test/main/mysqlbinlog_force_read_truncated.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# MDEV-40545: --force-read must not loop on a truncated event
#
# The event header is truncated
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
/*!40019 SET @@session.max_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/;
ERROR: Error in Log_event::read_log_event(): 'Event truncated'
ERROR: Could not read entry at offset 4: Error in log format or read error.
# The event body is truncated
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
/*!40019 SET @@session.max_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/;
ERROR: Error in Log_event::read_log_event(): 'Event truncated', data_len: 94, event_type: 15
ERROR: Could not read entry at offset 4: Error in log format or read error.
# End of 11.4 tests
13 changes: 13 additions & 0 deletions mysql-test/main/mysqlbinlog_force_read_truncated.test
View file
Open in desktop
Comment thread
ParadoxV5 marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--echo #
--echo # MDEV-40545: --force-read must not loop on a truncated event
--echo #

--echo # The event header is truncated
--error 1
--exec $MYSQL_BINLOG --short-form --force-read $MYSQL_TEST_DIR/std_data/truncated_binlog_header.000001 2>&1

--echo # The event body is truncated
--error 1
--exec $MYSQL_BINLOG --short-form --force-read $MYSQL_TEST_DIR/std_data/truncated_binlog_body.000001 2>&1

--echo # End of 11.4 tests
Binary file added mysql-test/std_data/truncated_binlog_body.000001
View file
Open in desktop
Comment thread
ParadoxV5 marked this conversation as resolved.
Binary file not shown.
Binary file added mysql-test/std_data/truncated_binlog_header.000001
View file
Open in desktop
Comment thread
ParadoxV5 marked this conversation as resolved.
Binary file not shown.
9 changes: 4 additions & 5 deletions sql/log_event.cc
View file
Open in desktop
Comment thread
ParadoxV5 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,10 @@ Log_event* Log_event::read_log_event(IO_CACHE* file, int *out_error,
error= "Event too big";
goto err;
case LOG_READ_DECRYPT:
#ifdef MYSQL_CLIENT
if (force_opt)
DBUG_RETURN(new Unknown_log_event());
#endif
error= "Event decryption failure";
goto err;
case LOG_READ_CHECKSUM_FAILURE:
Expand All @@ -956,11 +960,6 @@ Log_event* Log_event::read_log_event(IO_CACHE* file, int *out_error,
if (unlikely(error))
{
DBUG_ASSERT(!res);
#ifdef MYSQL_CLIENT
if (force_opt)
DBUG_RETURN(new Unknown_log_event());
#endif

/*
The SQL slave thread will check *out_error to know
if there was an I/O error. Even if there is no "low-level" I/O errors
Expand Down