branches/zip: Non-functional change:

buf_block_dbg_add_level(block, level): Define as an empty macro when UNIV_SYNC_DEBUG is not defined. Remove #ifdef UNIV_SYNC_DEBUG around all invocations.
17 years ago · d87663c9f0
21 changed files with 35 additions and 113 deletions
--- a/btr/btr0btr.c
+++ b/btr/btr0btr.c
@ -313,9 +313,7 @@ btr_page_alloc_for_ibuf(
 				 dict_table_zip_size(index->table),
 				 node_addr.page, RW_X_LATCH, mtr);
 	new_page = buf_block_get_frame(new_block);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(new_block, SYNC_TREE_NODE_NEW);
-#endif /* UNIV_SYNC_DEBUG */

 	flst_remove(root + PAGE_HEADER + PAGE_BTR_IBUF_FREE_LIST,
 		    new_page + PAGE_HEADER + PAGE_BTR_IBUF_FREE_LIST_NODE,
@ -375,9 +373,7 @@ btr_page_alloc(
 	new_block = buf_page_get(dict_index_get_space(index),
 				 dict_table_zip_size(index->table),
 				 new_page_no, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(new_block, SYNC_TREE_NODE_NEW);
-#endif /* UNIV_SYNC_DEBUG */

 	return(new_block);
 }
@ -735,9 +731,8 @@ btr_create(
 			space, 0,
 			IBUF_HEADER + IBUF_TREE_SEG_HEADER, mtr);

-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(ibuf_hdr_block, SYNC_TREE_NODE_NEW);
-#endif /* UNIV_SYNC_DEBUG */
+
 		ut_ad(buf_block_get_page_no(ibuf_hdr_block)
 		      == IBUF_HEADER_PAGE_NO);
 		/* Allocate then the next page to the segment: it will be the
@ -766,9 +761,7 @@ btr_create(
 	page_no = buf_block_get_page_no(block);
 	frame = buf_block_get_frame(block);

-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_TREE_NODE_NEW);
-#endif /* UNIV_SYNC_DEBUG */

 	if (type & DICT_IBUF) {
 		/* It is an insert buffer tree: initialize the free list */
@ -783,9 +776,7 @@ btr_create(
 			    PAGE_HEADER + PAGE_BTR_SEG_LEAF, mtr);
 		/* The fseg create acquires a second latch on the page,
 		therefore we must declare it: */
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE_NEW);
-#endif /* UNIV_SYNC_DEBUG */
 	}

 	/* Create a new index page on the the allocated segment page */
--- a/btr/btr0cur.c
+++ b/btr/btr0cur.c
@ -503,11 +503,10 @@ retry_page_get:

 		block->check_index_page_at_flush = TRUE;

-#ifdef UNIV_SYNC_DEBUG
 		if (rw_latch != RW_NO_LATCH) {
 			buf_block_dbg_add_level(block, SYNC_TREE_NODE);
 		}
-#endif
+
 		ut_ad(0 == ut_dulint_cmp(index->id,
 					 btr_page_get_index_id(page)));

@ -3852,10 +3851,8 @@ btr_store_big_rec_extern_fields(
 				prev_block = buf_page_get(space_id, zip_size,
 							  prev_page_no,
 							  RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 				buf_block_dbg_add_level(prev_block,
 							SYNC_EXTERN_STORAGE);
-#endif /* UNIV_SYNC_DEBUG */
 				prev_page = buf_block_get_frame(prev_block);

 				if (UNIV_LIKELY_NULL(page_zip)) {
@ -3950,10 +3947,9 @@ btr_store_big_rec_extern_fields(
 				rec_block = buf_page_get(space_id, zip_size,
 							 rec_page_no,
 							 RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 				buf_block_dbg_add_level(rec_block,
 							SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */
+
 				if (err == Z_STREAM_END) {
 					mach_write_to_4(field_ref
 							+ BTR_EXTERN_LEN, 0);
@ -4029,10 +4025,8 @@ next_zip_page:
 				rec_block = buf_page_get(space_id, zip_size,
 							 rec_page_no,
 							 RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 				buf_block_dbg_add_level(rec_block,
 							SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */

 				mlog_write_ulint(field_ref + BTR_EXTERN_LEN, 0,
 						 MLOG_4BYTES, &mtr);
@ -4176,9 +4170,7 @@ btr_free_externally_stored_field(
 					 page_get_page_no(
 						 page_align(field_ref)),
 					 RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(rec_block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */
 		page_no = mach_read_from_4(field_ref + BTR_EXTERN_PAGE_NO);

 		if (/* There is no external storage data */
@ -4199,9 +4191,7 @@ btr_free_externally_stored_field(

 		ext_block = buf_page_get(space_id, ext_zip_size, page_no,
 					 RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(ext_block, SYNC_EXTERN_STORAGE);
-#endif /* UNIV_SYNC_DEBUG */
 		page = buf_block_get_frame(ext_block);

 		if (ext_zip_size) {
@ -4391,9 +4381,7 @@ btr_copy_blob_prefix(
 		mtr_start(&mtr);

 		block = buf_page_get(space_id, 0, page_no, RW_S_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_EXTERN_STORAGE);
-#endif /* UNIV_SYNC_DEBUG */
 		page = buf_block_get_frame(block);

 		/* Unfortunately, FIL_PAGE_TYPE was uninitialized for
--- a/btr/btr0pcur.c
+++ b/btr/btr0pcur.c
@ -244,10 +244,10 @@ btr_pcur_restore_position(
 					cursor->block_when_stored,
 					cursor->modify_clock, mtr))) {
 			cursor->pos_state = BTR_PCUR_IS_POSITIONED;
-#ifdef UNIV_SYNC_DEBUG
+
 			buf_block_dbg_add_level(btr_pcur_get_block(cursor),
 						SYNC_TREE_NODE);
-#endif /* UNIV_SYNC_DEBUG */
+
 			if (cursor->rel_pos == BTR_PCUR_ON) {
 #ifdef UNIV_DEBUG
 				const rec_t*	rec;
--- a/btr/btr0sea.c
+++ b/btr/btr0sea.c
@ -845,9 +845,7 @@ btr_search_guess_on_hash(

 		rw_lock_s_unlock(&btr_search_latch);

-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);
-#endif /* UNIV_SYNC_DEBUG */
 	}

 	if (UNIV_UNLIKELY(buf_block_get_state(block)
@ -1158,9 +1156,7 @@ btr_search_drop_page_hash_when_freed(
 				BUF_GET_IF_IN_POOL, __FILE__, __LINE__,
 				&mtr);

-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);
-#endif /* UNIV_SYNC_DEBUG */

 	btr_search_drop_page_hash_index(block);

--- a/buf/buf0buf.c
+++ b/buf/buf0buf.c
@ -2201,9 +2201,8 @@ buf_page_optimistic_get_func(
 	}

 	if (UNIV_UNLIKELY(modify_clock != block->modify_clock)) {
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */
+
 		if (rw_latch == RW_S_LATCH) {
 			rw_lock_s_unlock(&(block->lock));
 		} else {
@ -2403,9 +2402,8 @@ buf_page_try_get_func(
 #ifdef UNIV_DEBUG_FILE_ACCESSES
 	ut_a(block->page.file_page_was_freed == FALSE);
 #endif /* UNIV_DEBUG_FILE_ACCESSES */
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */
+
 	buf_pool->n_page_gets++;

 	return(block);
--- a/dict/dict0boot.c
+++ b/dict/dict0boot.c
@ -39,9 +39,9 @@ dict_hdr_get(
 	block = buf_page_get(DICT_HDR_SPACE, 0, DICT_HDR_PAGE_NO,
 			     RW_X_LATCH, mtr);
 	header = DICT_HDR + buf_block_get_frame(block);
-#ifdef UNIV_SYNC_DEBUG
+
 	buf_block_dbg_add_level(block, SYNC_DICT_HEADER);
-#endif /* UNIV_SYNC_DEBUG */
+
 	return(header);
 }

--- a/fsp/fsp0fsp.c
+++ b/fsp/fsp0fsp.c
@ -345,9 +345,8 @@ fsp_get_space_header(

 	block = buf_page_get(id, zip_size, 0, RW_X_LATCH, mtr);
 	header = FSP_HEADER_OFFSET + buf_block_get_frame(block);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 	ut_ad(id == mach_read_from_4(FSP_SPACE_ID + header));
 	ut_ad(zip_size == dict_table_flags_to_zip_size(
 		      mach_read_from_4(FSP_SPACE_FLAGS + header)));
@ -730,9 +729,8 @@ xdes_get_descriptor_with_space_hdr(

 		block = buf_page_get(space, zip_size, descr_page_no,
 				     RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 		descr_page = buf_block_get_frame(block);
 	}

@ -765,9 +763,8 @@ xdes_get_descriptor(
 	fsp_header_t*	sp_header;

 	block = buf_page_get(space, zip_size, 0, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 	sp_header = FSP_HEADER_OFFSET + buf_block_get_frame(block);
 	return(xdes_get_descriptor_with_space_hdr(sp_header, space, offset,
 						  mtr));
@ -948,9 +945,7 @@ fsp_header_init(
 	zip_size = dict_table_flags_to_zip_size(flags);
 	block = buf_page_create(space, 0, zip_size, mtr);
 	buf_page_get(space, zip_size, 0, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */

 	/* The prior contents of the file page should be ignored */

@ -1380,10 +1375,9 @@ fsp_fill_free_list(
 					space, i, zip_size, mtr);
 				buf_page_get(space, zip_size, i,
 					     RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 				buf_block_dbg_add_level(block,
 							SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 				fsp_init_file_page(block, mtr);
 				mlog_write_ulint(buf_block_get_frame(block)
 						 + FIL_PAGE_TYPE,
@ -1404,9 +1398,8 @@ fsp_fill_free_list(
 			buf_page_get(space, zip_size,
 				     i + FSP_IBUF_BITMAP_OFFSET,
 				     RW_X_LATCH, &ibuf_mtr);
-#ifdef UNIV_SYNC_DEBUG
 			buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 			fsp_init_file_page(block, &ibuf_mtr);

 			ibuf_bitmap_page_init(block, &ibuf_mtr);
@ -1637,9 +1630,7 @@ fsp_alloc_free_page(
 	buf_page_create(space, page_no, zip_size, mtr);

 	block = buf_page_get(space, zip_size, page_no, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */

 	/* Prior contents of the page should be ignored */
 	fsp_init_file_page(block, mtr);
@ -1881,9 +1872,7 @@ fsp_alloc_seg_inode_page(
 	}

 	block = buf_page_get(space, zip_size, page_no, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */

 	block->check_index_page_at_flush = FALSE;

@ -1941,9 +1930,8 @@ fsp_alloc_seg_inode(
 		mach_read_from_4(FSP_SPACE_FLAGS + space_header));
 	block = buf_page_get(page_get_space_id(page_align(space_header)),
 			     zip_size, page_no, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 	page = buf_block_get_frame(block);

 	n = fsp_seg_inode_page_find_free(page, 0, zip_size, mtr);
@ -2714,9 +2702,8 @@ fseg_alloc_free_page_low(
 			mach_read_from_4(FSP_SPACE_FLAGS + space_header));

 		block = buf_page_create(space, ret_page, zip_size, mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 		if (UNIV_UNLIKELY(block != buf_page_get(space, zip_size,
 							ret_page, RW_X_LATCH,
 							mtr))) {
--- a/ibuf/ibuf0ibuf.c
+++ b/ibuf/ibuf0ibuf.c
@ -304,10 +304,7 @@ ibuf_header_page_get(

 	block = buf_page_get(space, 0, FSP_IBUF_HEADER_PAGE_NO,
 			     RW_X_LATCH, mtr);
-
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_IBUF_HEADER);
-#endif /* UNIV_SYNC_DEBUG */

 	return(buf_block_get_frame(block));
 }
@ -332,9 +329,7 @@ ibuf_tree_root_get(

 	block = buf_page_get(space, 0, FSP_IBUF_TREE_ROOT_PAGE_NO, RW_X_LATCH,
 			     mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_TREE_NODE);
-#endif /* UNIV_SYNC_DEBUG */

 	return(buf_block_get_frame(block));
 }
@ -497,9 +492,8 @@ ibuf_data_init_for_space(
 		buf_block_t*	block = buf_page_get(
 			space, 0, FSP_IBUF_TREE_ROOT_PAGE_NO,
 			RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
-#endif /* UNIV_SYNC_DEBUG */
+
 		root = buf_block_get_frame(block);
 	}

@ -777,9 +771,7 @@ ibuf_bitmap_get_map_page(
 	block = buf_page_get(space, zip_size,
 			     ibuf_bitmap_page_no_calc(zip_size, page_no),
 			     RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_IBUF_BITMAP);
-#endif /* UNIV_SYNC_DEBUG */

 	return(buf_block_get_frame(block));
 }
@ -1773,9 +1765,8 @@ ibuf_add_free_page(
 	{
 		buf_block_t*	block = buf_page_get(
 			space, 0, page_no, RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE_NEW);
-#endif /* UNIV_SYNC_DEBUG */
+
 		page = buf_block_get_frame(block);
 	}

@ -1903,9 +1894,8 @@ ibuf_remove_free_page(
 	{
 		buf_block_t*	block = buf_page_get(
 			space, 0, page_no, RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
-#endif /* UNIV_SYNC_DEBUG */
+
 		page = buf_block_get_frame(block);
 	}

@ -2462,9 +2452,8 @@ ibuf_get_volume_buffered(
 	{
 		buf_block_t*	block = buf_page_get(
 			0, 0, prev_page_no, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
-#endif /* UNIV_SYNC_DEBUG */
+
 		prev_page = buf_block_get_frame(block);
 	}
 #ifdef UNIV_BTR_DEBUG
@ -2532,9 +2521,8 @@ count_later:
 	{
 		buf_block_t*	block = buf_page_get(
 			0, 0, next_page_no, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
-#endif /* UNIV_SYNC_DEBUG */
+
 		next_page = buf_block_get_frame(block);
 	}
 #ifdef UNIV_BTR_DEBUG
@ -3366,9 +3354,8 @@ loop:
 							  __FILE__, __LINE__,
 							  &mtr);
 		ut_a(success);
-#ifdef UNIV_SYNC_DEBUG
+
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
-#endif /* UNIV_SYNC_DEBUG */
 	}

 	/* Position pcur in the insert buffer at the first entry for this
--- a/include/btr0btr.ic
+++ b/include/btr0btr.ic
@ -29,12 +29,12 @@ btr_block_get(
 	buf_block_t*	block;

 	block = buf_page_get(space, zip_size, page_no, mode, mtr);
-#ifdef UNIV_SYNC_DEBUG
+
 	if (mode != RW_NO_LATCH) {

 		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
 	}
-#endif
+
 	return(block);
 }

--- a/include/buf0buf.h
+++ b/include/buf0buf.h
@ -603,6 +603,8 @@ buf_block_dbg_add_level(
 	buf_block_t*	block,	/* in: buffer page
 				where we have acquired latch */
 	ulint		level);	/* in: latching order level */
+#else /* UNIV_SYNC_DEBUG */
+# define buf_block_dbg_add_level(block, level) /* nothing */
 #endif /* UNIV_SYNC_DEBUG */
 /*************************************************************************
 Gets the state of a block. */
--- a/include/fut0fut.ic
+++ b/include/fut0fut.ic
@ -33,9 +33,7 @@ fut_get_ptr(
 	block = buf_page_get(space, zip_size, addr.page, rw_latch, mtr);
 	ptr = buf_block_get_frame(block) + addr.boffset;

-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */

 	return(ptr);
 }
--- a/include/trx0rseg.ic
+++ b/include/trx0rseg.ic
@ -26,9 +26,8 @@ trx_rsegf_get(
 	trx_rsegf_t*	header;

 	block = buf_page_get(space, zip_size, page_no, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_RSEG_HEADER);
-#endif /* UNIV_SYNC_DEBUG */
+
 	header = TRX_RSEG + buf_block_get_frame(block);

 	return(header);
@ -52,9 +51,8 @@ trx_rsegf_get_new(
 	trx_rsegf_t*	header;

 	block = buf_page_get(space, zip_size, page_no, RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_RSEG_HEADER_NEW);
-#endif /* UNIV_SYNC_DEBUG */
+
 	header = TRX_RSEG + buf_block_get_frame(block);

 	return(header);
--- a/include/trx0sys.ic
+++ b/include/trx0sys.ic
@ -100,9 +100,8 @@ trx_sysf_get(

 	block = buf_page_get(TRX_SYS_SPACE, 0, TRX_SYS_PAGE_NO,
 			     RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_TRX_SYS_HEADER);
-#endif /* UNIV_SYNC_DEBUG */
+
 	header = TRX_SYS + buf_block_get_frame(block);

 	return(header);
--- a/include/trx0undo.ic
+++ b/include/trx0undo.ic
@ -135,9 +135,7 @@ trx_undo_page_get(
 {
 	buf_block_t*	block = buf_page_get(space, zip_size, page_no,
 					     RW_X_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_TRX_UNDO_PAGE);
-#endif /* UNIV_SYNC_DEBUG */

 	return(buf_block_get_frame(block));
 }
@ -157,9 +155,7 @@ trx_undo_page_get_s_latched(
 {
 	buf_block_t*	block = buf_page_get(space, zip_size, page_no,
 					     RW_S_LATCH, mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_TRX_UNDO_PAGE);
-#endif /* UNIV_SYNC_DEBUG */

 	return(buf_block_get_frame(block));
 }
--- a/lock/lock0lock.c
+++ b/lock/lock0lock.c
@ -4699,9 +4699,8 @@ lock_rec_validate_page(

 	block = buf_page_get(space, fil_space_get_zip_size(space),
 			     page_no, RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */
+
 	page = block->frame;

 	lock_mutex_enter_kernel();
--- a/log/log0recv.c
+++ b/log/log0recv.c
@ -1253,9 +1253,7 @@ recv_recover_page(
 						    &mtr);
 		ut_a(success);

-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */
 	}

 	/* Read the newest modification lsn from the page */
@ -1491,10 +1489,9 @@ loop:
 					block = buf_page_get(
 						space, zip_size, page_no,
 						RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 					buf_block_dbg_add_level(
 						block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */
+
 					recv_recover_page(FALSE, FALSE, block);
 					mtr_commit(&mtr);
 				} else {
--- a/row/row0purge.c
+++ b/row/row0purge.c
@ -447,9 +447,8 @@ skip_secondaries:
 			that the space id of the undo log record is 0! */

 			block = buf_page_get(0, 0, page_no, RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 			buf_block_dbg_add_level(block, SYNC_TRX_UNDO_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 			data_field = buf_block_get_frame(block)
 				+ offset + internal_offset;

--- a/trx/trx0rec.c
+++ b/trx/trx0rec.c
@ -1231,9 +1231,8 @@ trx_undo_report_row_operation(
 					      page_no, RW_X_LATCH,
 					      undo->guess_block, BUF_GET,
 					      __FILE__, __LINE__, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(undo_block, SYNC_TRX_UNDO_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 		undo_page = buf_block_get_frame(undo_block);

 		if (op_type == TRX_UNDO_INSERT_OP) {
--- a/trx/trx0rseg.c
+++ b/trx/trx0rseg.c
@ -84,9 +84,7 @@ trx_rseg_header_create(
 		return(FIL_NULL);
 	}

-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_RSEG_HEADER_NEW);
-#endif /* UNIV_SYNC_DEBUG */

 	page_no = buf_block_get_page_no(block);

--- a/trx/trx0sys.c
+++ b/trx/trx0sys.c
@ -187,9 +187,7 @@ trx_sys_mark_upgraded_to_multiple_tablespaces(void)

 	block = buf_page_get(TRX_SYS_SPACE, 0, TRX_SYS_PAGE_NO,
 			     RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */

 	doublewrite = buf_block_get_frame(block) + TRX_SYS_DOUBLEWRITE;

@ -233,9 +231,7 @@ start_again:

 	block = buf_page_get(TRX_SYS_SPACE, 0, TRX_SYS_PAGE_NO,
 			     RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */

 	doublewrite = buf_block_get_frame(block) + TRX_SYS_DOUBLEWRITE;

@ -272,9 +268,7 @@ start_again:
 		/* fseg_create acquires a second latch on the page,
 		therefore we must declare it: */

-#ifdef UNIV_SYNC_DEBUG
 		buf_block_dbg_add_level(block2, SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */

 		if (block2 == NULL) {
 			fprintf(stderr,
@ -321,10 +315,8 @@ start_again:

 			new_block = buf_page_get(TRX_SYS_SPACE, 0, page_no,
 						 RW_X_LATCH, &mtr);
-#ifdef UNIV_SYNC_DEBUG
 			buf_block_dbg_add_level(new_block,
 						SYNC_NO_ORDER_CHECK);
-#endif /* UNIV_SYNC_DEBUG */

 			/* Make a dummy change to the page to ensure it will
 			be written to disk in a flush */
@ -902,9 +894,8 @@ trx_sysf_create(
 	/* Create the trx sys file block in a new allocated file segment */
 	block = fseg_create(TRX_SYS_SPACE, 0, TRX_SYS + TRX_SYS_FSEG_HEADER,
 			    mtr);
-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_TRX_SYS_HEADER);
-#endif /* UNIV_SYNC_DEBUG */
+
 	ut_a(buf_block_get_page_no(block) == TRX_SYS_PAGE_NO);

 	page = buf_block_get_frame(block);
--- a/trx/trx0undo.c
+++ b/trx/trx0undo.c
@ -457,9 +457,8 @@ trx_undo_seg_create(
 		return(DB_OUT_OF_FILE_SPACE);
 	}

-#ifdef UNIV_SYNC_DEBUG
 	buf_block_dbg_add_level(block, SYNC_TRX_UNDO_PAGE);
-#endif /* UNIV_SYNC_DEBUG */
+
 	*undo_page = buf_block_get_frame(block);

 	page_hdr = *undo_page + TRX_UNDO_PAGE_HDR;