diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 23b7fb2d479..8e3e4efbb0e 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -41,9 +41,11 @@ IF(UNIX)
 ENDIF()
 
 # Enable InnoDB's UNIV_DEBUG if MySQL's WITH_DEBUG[_FULL] is defined
-IF(WITH_DEBUG OR WITH_DEBUG_FULL)
-  ADD_DEFINITIONS("-DUNIV_DEBUG")
-ENDIF()
+# enable when this bug is resolved:
+# Bug#54861 Additional connections not handled properly in mtr --embedded
+#IF(WITH_DEBUG OR WITH_DEBUG_FULL)
+#  ADD_DEFINITIONS("-DUNIV_DEBUG")
+#ENDIF()
 
 IF(NOT MSVC)
 # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not