mirror of
https://github.com/MariaDB/server.git
synced 2026-04-20 15:25:33 +02:00
Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windows
Remove per-project SAFEMALLOCs definitions, as they result in malloc/free mismatches.
This commit is contained in:
parent
29c60cd5b7
commit
e378fa5be0
2 changed files with 0 additions and 10 deletions
|
|
@ -15,9 +15,6 @@
|
||||||
|
|
||||||
# This is CMakeLists.txt for semi-sync replication plugins
|
# 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
|
# Add common include directories
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
|
||||||
${CMAKE_SOURCE_DIR}/sql
|
${CMAKE_SOURCE_DIR}/sql
|
||||||
|
|
|
||||||
|
|
@ -15,13 +15,6 @@
|
||||||
|
|
||||||
# This is the CMakeLists for InnoDB Plugin
|
# 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
|
# Starting at 5.1.38, MySQL CMake files are simplified. But the plugin
|
||||||
# CMakeLists.txt still needs to work with previous versions of MySQL.
|
# CMakeLists.txt still needs to work with previous versions of MySQL.
|
||||||
IF (MYSQL_VERSION_ID GREATER "50137")
|
IF (MYSQL_VERSION_ID GREATER "50137")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue