summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authoriggy@recycle.(none) <>2007-03-20 10:07:23 -0400
committeriggy@recycle.(none) <>2007-03-20 10:07:23 -0400
commit9a5f0bff4f73bc2197465ba958f2e77927b29ae2 (patch)
tree0e179c081302b73d9f59dbf8534972f0a1928735 /innobase
parent9ff0553f7a96f3daad4abedd8e12b29e357ee56b (diff)
downloadmariadb-git-9a5f0bff4f73bc2197465ba958f2e77927b29ae2.tar.gz
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.
Diffstat (limited to 'innobase')
-rwxr-xr-xinnobase/CMakeLists.txt4
1 files 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)