List:Commits« Previous MessageNext Message »
From:marko.makela Date:September 9 2010 12:14pm
Subject:bzr commit into mysql-5.5-innodb branch (marko.makela:3178)
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:marko.makela@stripped7zyzbv10nvi1

 3178 Marko Mäkelä	2010-09-09 [merge]
      Merge Vasil Dimov 2010-09-09 Enable UNIV_DEBUG when WITH_DEBUG is defined

    modified:
      storage/innobase/CMakeLists.txt
=== modified file 'storage/innobase/CMakeLists.txt'
--- a/storage/innobase/CMakeLists.txt	revid:marko.makela@stripped
+++ b/storage/innobase/CMakeLists.txt	revid:marko.makela@oracle.com-20100909121405-vvfiuolgr7iumjz7
@@ -40,12 +40,10 @@ IF(UNIX)
   ENDIF()
 ENDIF()
 
-# Enable InnoDB's UNIV_DEBUG if MySQL's WITH_DEBUG[_FULL] is defined
-# enable when this bug is resolved:
-# Bug#54861 Additional connections not handled properly in mtr --embedded
-#IF(WITH_DEBUG)
-#  ADD_DEFINITIONS("-DUNIV_DEBUG")
-#ENDIF()
+# Enable InnoDB's UNIV_DEBUG if MySQL's WITH_DEBUG is defined
+IF(WITH_DEBUG)
+  ADD_DEFINITIONS("-DUNIV_DEBUG")
+ENDIF()
 
 IF(NOT MSVC)
 # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100909121405-vvfiuolgr7iumjz7.bundle
Thread
bzr commit into mysql-5.5-innodb branch (marko.makela:3178) marko.makela9 Sep