summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2009-12-18 22:13:56 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2009-12-18 22:13:56 +0100
commit8cffae12a6ab9104c533a8fcf90df66f7b14b4f0 (patch)
treec71d9f34d69637f47c5b9cd7c2ec9dad35bbdb36 /storage
parent66c4b4ae5d9d5e2e88fa51227d803fc4706b86fa (diff)
parentfef794a800b839b78283898a99c1747ba5f6cbdc (diff)
downloadmariadb-git-8cffae12a6ab9104c533a8fcf90df66f7b14b4f0.tar.gz
merge
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/CMakeLists.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index d67b518642c..b63ed840f3c 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -15,13 +15,6 @@
# 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
# CMakeLists.txt still needs to work with previous versions of MySQL.
IF (MYSQL_VERSION_ID GREATER "50137")