Skip to content

Commit e378fa5

Browse files
committed
Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windows
Remove per-project SAFEMALLOCs definitions, as they result in malloc/free mismatches.
1 parent 29c60cd commit e378fa5

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

plugin/semisync/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515

1616
# This is CMakeLists.txt for semi-sync replication plugins
1717

18-
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
19-
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
20-
2118
# Add common include directories
2219
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
2320
${CMAKE_SOURCE_DIR}/sql

storage/innobase/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515

1616
# This is the CMakeLists for InnoDB Plugin
1717

18-
19-
# TODO: remove the two FLAGS_DEBUG settings when merging into
20-
# 6.0-based trees, like is already the case for other engines in
21-
# those trees.
22-
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
23-
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
24-
2518
# Starting at 5.1.38, MySQL CMake files are simplified. But the plugin
2619
# CMakeLists.txt still needs to work with previous versions of MySQL.
2720
IF (MYSQL_VERSION_ID GREATER "50137")

0 commit comments

Comments
 (0)