From 996843e51e3d9c18cc77886d3911f05ce79313b8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 20 Mar 2007 10:07:23 -0400 Subject: [PATCH] Bug#25765 too many dbg heap assertions on windows - SAFEMALLOC should be defined for each project in debug Windows builds. SAFEMALLOC was not defined for the innodb project. Debug asserts caused due to mixed SAFEMALLOC defines. innobase/CMakeLists.txt: Bug#25765 too many dbg heap assertions on windows - Make sure that *_DEBUG defaults are not overwritten. - Define SAFEMALLOC and SAFE_MUTEX for debug innodb builds. --- innobase/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/innobase/CMakeLists.txt b/innobase/CMakeLists.txt index 21b9210a73e..36c256932d2 100755 --- a/innobase/CMakeLists.txt +++ b/innobase/CMakeLists.txt @@ -13,8 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#SET(CMAKE_CXX_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX") -#SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX") +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_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB) # Bug#19424 - InnoDB: Possibly a memory overrun of the buffer being freed (64-bit Visual C)