Commit 62655189 authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god
Browse files

Bug #34297: MySQL Server crashes when processing large table 

Remove optimizations on innobase/mem/* to avoid apparent compiler bug which
causes memory overruns.  See also bug 19424, and probably bug 36366.

This is done in 5.1+; 5.0 already has this workaround in place.
parent 46375759

storage/innobase/CMakeLists.txt

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ 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 -D_LIB)



# Bug 19424 - InnoDB: Possibly a memory overrun of the buffer being freed (64-bit Visual C)

# Removing Win64 compiler optimizations for all innodb/mem/* files.

IF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 8)

  SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/storage/innobase/mem/mem0mem.c

                              ${CMAKE_SOURCE_DIR}/storage/innobase/mem/mem0pool.c

                              PROPERTIES COMPILE_FLAGS -Od)

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 8)



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib

                    ${CMAKE_SOURCE_DIR}/storage/innobase/include

                    ${CMAKE_SOURCE_DIR}/storage/innobase/handler