Merge 10.6 into 10.11

Author: dr-m

storage/innobase/buf/buf0buf.cc

@@ -3899,19 +3899,6 @@ dberr_t buf_page_t::read_complete(const fil_node_t &node) noexcept
     goto database_corrupted;
   }
 
-  if (belongs_to_unzip_LRU())
-  {
-    buf_pool.n_pend_unzip++;
-    auto ok= buf_zip_decompress(reinterpret_cast<buf_block_t*>(this), false);
-    buf_pool.n_pend_unzip--;
-
-    if (!ok)
-    {
-      err= DB_PAGE_CORRUPTED;
-      goto database_corrupted_compressed;
-    }
-  }
-
   {
     const page_id_t read_id(mach_read_from_4(read_frame + FIL_PAGE_SPACE_ID),
                             mach_read_from_4(read_frame + FIL_PAGE_OFFSET));
@@ -3952,6 +3939,19 @@ dberr_t buf_page_t::read_complete(const fil_node_t &node) noexcept
     }
   }
 
+  if (belongs_to_unzip_LRU())
+  {
+    buf_pool.n_pend_unzip++;
+    auto ok= buf_zip_decompress(reinterpret_cast<buf_block_t*>(this), false);
+    buf_pool.n_pend_unzip--;
+
+    if (!ok)
+    {
+      err= DB_PAGE_CORRUPTED;
+      goto database_corrupted_compressed;
+    }
+  }
+
   err= buf_page_check_corrupt(this, node);
   if (UNIV_UNLIKELY(err != DB_SUCCESS))
   {

storage/innobase/buf/buf0dblwr.cc

@@ -381,7 +381,7 @@ void buf_dblwr_t::recover() noexcept
     const page_t *const page= *i;
     const uint32_t page_no= page_get_page_no(page);
     const lsn_t lsn= mach_read_from_8(page + FIL_PAGE_LSN);
-    if (log_sys.last_checkpoint_lsn > lsn || lsn > recv_sys.lsn)
+    if (log_sys.last_checkpoint_lsn > lsn || lsn > max_lsn)
       /* Pages written before or after the recovery range are not usable. */
       continue;
     const uint32_t space_id= page_get_space_id(page);