bzr commit into mysql-trunk-innodb branch (marko.makela:3109) Bug#53593

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:marko.makela@strippedfe9oyj51ngew

 3109 Marko Mäkelä	2010-06-21
      Bug#53593: Add some instrumentation to improve Valgrind sensitivity.
      Implement WITH_VALGRIND for the CMake build.

    modified:
      CMakeLists.txt
      config.h.cmake
      configure.cmake
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	revid:marko.makela@stripped621103239-vjsbfe9oyj51ngew
+++ b/CMakeLists.txt	revid:marko.makela@stripped
@@ -115,6 +115,9 @@ OPTION(ENABLED_PROFILING "Enable profili
 OPTION(CYBOZU "" OFF)
 OPTION(BACKUP_TEST "" OFF)
 OPTION(WITHOUT_SERVER OFF)
+IF(UNIX)
+  OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
+ENDIF()
 OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
 MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
 

=== modified file 'config.h.cmake'
--- a/config.h.cmake	revid:marko.makela@strippedngew
+++ b/config.h.cmake	revid:marko.makela@stripped0100621105333-papycpjr3smskyxv
@@ -292,7 +292,7 @@
 #define USE_MB 1
 #define USE_MB_IDENT 1
 
-
+#cmakedefine HAVE_VALGRIND
 
 /* Types we may use */
 #cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@

=== modified file 'configure.cmake'
--- a/configure.cmake	revid:marko.makela@stripped621103239-vjsbfe9oyj51ngew
+++ b/configure.cmake	revid:marko.makela@stripped
@@ -969,6 +969,16 @@ configuration. By default gcc built-in s
 if available and 'smp' configuration otherwise.")
 MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY)
 
+IF(WITH_VALGRIND)
+  CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 
+    HAVE_VALGRIND_HEADERS)
+ENDIF()
+IF(WITH_VALGRIND AND HAVE_VALGRIND_HEADERS)
+  SET(HAVE_VALGRIND 1)
+ELSE()
+  SET(HAVE_VALGRIND 0)
+ENDIF()
+
 #--------------------------------------------------------------------
 # Check for IPv6 support
 #--------------------------------------------------------------------

Attachment: [text/bzr-bundle] bzr/[e-mail]