Remove references to UNIV_SYNC_DEBUG which was merged with UNIV_DEBUG

storage/innobase/innodb.cmake

@@ -110,7 +110,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 ENDIF()
 
 # Enable InnoDB's UNIV_DEBUG in debug builds
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG -DUNIV_SYNC_DEBUG")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG")
 
 OPTION(WITH_INNODB_AHI "Include innodb_adaptive_hash_index" ON)
 OPTION(WITH_INNODB_ROOT_GUESS "Cache index root block descriptors" ON)

storage/innobase/lock/lock0lock.cc

@@ -6415,13 +6415,9 @@ lock_rec_validate_page(
 
 	ut_ad(!trx_is_ac_nl_ro(lock->trx));
 
-# ifdef UNIV_DEBUG
 	/* Only validate the record queues when this thread is not
-	holding a space->latch.  Deadlocks are possible due to
-	latching order violation when UNIV_DEBUG is defined while
-	UNIV_DEBUG is not. */
+	holding a space->latch. */
 	if (!sync_check_find(SYNC_FSP))
-# endif /* UNIV_DEBUG */
 	for (i = nth_bit; i < lock_rec_get_n_bits(lock); i++) {
 
 		if (i == 1 || lock_rec_get_nth_bit(lock, i)) {