Merge remote-tracking branch 'origin/release-8.2.0-1' into trunk

percona · Aug 23, 2024 · de2bb12 · de2bb12
2 parents 39bb57d + 53f63c8
commit de2bb12
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/storage/innobase/xtrabackup/src/redo_log.cc b/storage/innobase/xtrabackup/src/redo_log.cc
@@ -298,17 +298,8 @@ ssize_t Redo_Log_Reader::scan_log_recs(byte *buf, bool is_last, lsn_t start_lsn,
 
     if (block_header.m_hdr_no != expected_hdr_no && checksum_is_ok) {
       /* old log block, do nothing */
-      if (block_header.m_hdr_no < expected_hdr_no) {
-        *finished = true;
-        break;
-      }
-      xb::error() << "log block numbers mismatch:";
-      xb::error() << "expected log block no. " << expected_hdr_no
-                  << ", but got no. " << block_header.m_hdr_no
-                  << " from the log file.";
-
-      return (-1);
-
+      *finished = true;
+      break;
     } else if (!checksum_is_ok) {
       /* Garbage or an incompletely written log block */
       xb::warn() << "Log block checksum mismatch (block no "

diff --git a/storage/innobase/xtrabackup/utils/debian/changelog b/storage/innobase/xtrabackup/utils/debian/changelog
@@ -9,6 +9,12 @@ percona-xtrabackup-83 (8.3) unstable; urgency=low
 
  -- Vadim Yalovets <[email protected]>  Mon, 11 Mar 2024 09:01:20 +0300
 
+percona-xtrabackup-82 (8.2) unstable; urgency=low
+
+  * Packaging changes for version 8.2
+
+ -- Vadim Yalovets <[email protected]>  Fri, 11 Dec 202r3 09:01:20 +0300
+
 percona-xtrabackup-81 (8.1) unstable; urgency=low
 
   * Packaging changes for version 8.1