MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:December 18 2009 8:39pm
Subject:bzr commit into mysql-5.5-trunk-bugfixing branch (vvaintroub:2924)
Bug#49811
View as plain text  
#At file:///H:/bzr/mysql-trunk-bugfixing/ based on revid:mikael@stripped

 2924 Vladislav Vaintroub	2009-12-18
      Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windows
      Remove per-project SAFEMALLOCs definitions, as they result in malloc/free mismatches.

    modified:
      plugin/semisync/CMakeLists.txt
      storage/innobase/CMakeLists.txt
=== modified file 'plugin/semisync/CMakeLists.txt'
--- a/plugin/semisync/CMakeLists.txt	2009-12-04 09:54:11 +0000
+++ b/plugin/semisync/CMakeLists.txt	2009-12-18 20:39:24 +0000
@@ -15,9 +15,6 @@
 
 # This is CMakeLists.txt for semi-sync replication plugins
 
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-
 # Add common include directories
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/sql

=== modified file 'storage/innobase/CMakeLists.txt'
--- a/storage/innobase/CMakeLists.txt	2009-12-11 09:39:38 +0000
+++ b/storage/innobase/CMakeLists.txt	2009-12-18 20:39:24 +0000
@@ -15,13 +15,6 @@
 
 # This is the CMakeLists for InnoDB Plugin
 
-
-# TODO: remove the two FLAGS_DEBUG settings when merging into
-# 6.0-based trees, like is already the case for other engines in
-# those trees.
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-
 # Starting at 5.1.38, MySQL CMake files are simplified. But the plugin
 # CMakeLists.txt still needs to work with previous versions of MySQL.
 IF (MYSQL_VERSION_ID GREATER "50137")


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20091218203924-y3k778bc4izodvnw.bundle
Thread
bzr commit into mysql-5.5-trunk-bugfixing branch (vvaintroub:2924)Bug#49811Vladislav Vaintroub18 Dec