From: Christopher Powers
Date: January 20 2012 7:41pm
Subject: bzr push into mysql-trunk branch (chris.powers:3759 to 3760) Bug#13440472
List-Archive: http://lists.mysql.com/commits/142498
X-Bug: 13440472
Message-Id: <201201201943.q0KJh2mC012618@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3760 Christopher Powers	2012-01-20
      Bug#13440472 - MANY VALGRIND FAILURES ON DAILY-TRUNK
        
      Disable inline optimizations for valgrind builds to avoid false positives.

    modified:
      cmake/build_configurations/mysql_release.cmake
 3759 Inaam Rana	2012-01-20 [merge]
      merge from mysql-5.5

    modified:
      storage/innobase/os/os0file.cc
=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2011-12-08 20:30:18 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2012-01-20 19:32:00 +0000
@@ -149,11 +149,19 @@ IF(UNIX)
   # Default GCC flags
   IF(CMAKE_COMPILER_IS_GNUCC)
     SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+    # Disable inline optimizations for valgrind testing to avoid false positives
+    IF(WITH_VALGRIND)
+      SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
+    ENDIF()
     SET(CMAKE_C_FLAGS_DEBUG          "-O ${COMMON_C_FLAGS}")
     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
   ENDIF()
   IF(CMAKE_COMPILER_IS_GNUCXX)
     SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+    # Disable inline optimizations for valgrind testing to avoid false positives
+    IF(WITH_VALGRIND)
+      SET(COMMON_CXX_FLAGS             "-fno-inline ${COMMON_CXX_FLAGS}")
+    ENDIF()
     SET(CMAKE_CXX_FLAGS_DEBUG          "-O ${COMMON_CXX_FLAGS}")
     SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
   ENDIF()
@@ -166,7 +174,7 @@ IF(UNIX)
         SET(COMMON_CXX_FLAGS               "+DSitanium2 -mt -Aa")
         SET(CMAKE_C_FLAGS_DEBUG            "+O0 -g ${COMMON_C_FLAGS}")
         SET(CMAKE_CXX_FLAGS_DEBUG          "+O0 -g ${COMMON_CXX_FLAGS}")
-	# We have seen compiler bugs with optimisation and -g, so disabled for now
+        # We have seen compiler bugs with optimisation and -g, so disabled for now
         SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "+O2 ${COMMON_C_FLAGS}")
         SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "+O2 ${COMMON_CXX_FLAGS}")
       ENDIF()

No bundle (reason: useless for push emails).