Merge 10.5 into 10.6

storage/innobase/buf/buf0lru.cc

@@ -807,7 +807,7 @@ bool buf_LRU_free_page(buf_page_t *bpage, bool zip)
 		break;
 	case 1:
 		mysql_mutex_lock(&buf_pool.flush_list_mutex);
-		if (const lsn_t om = bpage->oldest_modification()) {
+		if (ut_d(const lsn_t om =) bpage->oldest_modification()) {
 			ut_ad(om == 1);
 			buf_pool.delete_from_flush_list(bpage);
 		}

storage/innobase/include/page0page.h

@@ -421,8 +421,7 @@ inline void page_rec_set_n_owned(buf_block_t *block, rec_t *rec, ulint n_owned,
   ut_ad(block->page.frame == page_align(rec));
   ut_ad(comp == (page_is_comp(block->page.frame) != 0));
 
-  if (page_zip_des_t *page_zip= compressed
-      ? buf_block_get_page_zip(block) : nullptr)
+  if (compressed && is_buf_block_get_page_zip(block))
   {
     ut_ad(comp);
     rec_set_bit_field_1(rec, n_owned, REC_NEW_N_OWNED,

storage/innobase/trx/trx0trx.cc

@@ -1807,7 +1807,7 @@ trx_print_low(
 			/*!< in: mem_heap_get_size(trx->lock.lock_heap) */
 {
 	if (const trx_id_t id = trx->id) {
-		fprintf(f, "TRANSACTION " TRX_ID_FMT, trx->id);
+		fprintf(f, "TRANSACTION " TRX_ID_FMT, id);
 	} else {
 		fprintf(f, "TRANSACTION (%p)", trx);
 	}