summaryrefslogtreecommitdiff
path: root/storage/innobase/innodb.cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-02-08 12:16:06 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2018-02-08 12:16:06 +0000
commit627d33d9cfe8737609e9f90e2e3814540acaeb81 (patch)
tree54ec1498b84d008dd9965dc7acb04bdfa754a8b2 /storage/innobase/innodb.cmake
parent6c5d364956a399eed40b56f7aa5a7a8c56c5708c (diff)
downloadmariadb-git-627d33d9cfe8737609e9f90e2e3814540acaeb81.tar.gz
Innodb, Windows : Reenable compiler optimizations for mem0mem.cc
Compiler optimizations were switched off due to MySQL Bug #19424, #36366, #34297, due to an alleged compiler bug. No proper analysis of code generation was done back then, thus proof of a compiler bug is missing. Even if there was a compiler bug 13 years ago, it could have been fixed. Will wait and see if there are any complains or crashes
Diffstat (limited to 'storage/innobase/innodb.cmake')
-rw-r--r--storage/innobase/innodb.cmake7
1 files changed, 0 insertions, 7 deletions
diff --git a/storage/innobase/innodb.cmake b/storage/innobase/innodb.cmake
index 4e11e946216..71c9cc8594b 100644
--- a/storage/innobase/innodb.cmake
+++ b/storage/innobase/innodb.cmake
@@ -233,13 +233,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro"
PROPERTIES COMPILE_FLAGS -xO3)
ENDIF()
-# Removing compiler optimizations for innodb/mem/* files on 64-bit Windows
-# due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297
-IF (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.cc mem/mem0pool.cc
- PROPERTIES COMPILE_FLAGS -Od)
-ENDIF()
-
# Avoid generating Hardware Capabilities due to crc32 instructions
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)