diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innodb_plugin/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | storage/xtradb/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | storage/xtradb/include/fsp0types.h | 2 |
3 files changed, 28 insertions, 13 deletions
diff --git a/storage/innodb_plugin/CMakeLists.txt b/storage/innodb_plugin/CMakeLists.txt index 87318ceec78..f79962e1c24 100644 --- a/storage/innodb_plugin/CMakeLists.txt +++ b/storage/innodb_plugin/CMakeLists.txt @@ -40,12 +40,19 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/extra/yassl/include) -# 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 $(WIN64)) - SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c - PROPERTIES COMPILE_FLAGS -Od) -ENDIF (MSVC AND $(WIN64)) +IF(MSVC) + # Removing compiler optimizations for innodb/mem/* files on 64-bit Windows + # due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297 + IF(CMAKE_SIZEOF_VOID_P MATCHES 8) + SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c + PROPERTIES COMPILE_FLAGS -Od) + ENDIF() + # Avoid "unreferenced label" warning in generated file + SET_SOURCE_FILES_PROPERTIES(pars/pars0grm.c + PROPERTIES COMPILE_FLAGS "/wd4102") + SET_SOURCE_FILES_PROPERTIES(pars/lexyy.c + PROPERTIES COMPILE_FLAGS "/wd4003") +ENDIF() SET(INNODB_PLUGIN_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index 759bb525bdf..0187cf097c1 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -42,12 +42,20 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/extra/yassl/include) -# 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 $(WIN64)) - SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c - PROPERTIES COMPILE_FLAGS -Od) -ENDIF (MSVC AND $(WIN64)) + +IF(MSVC) + # Removing compiler optimizations for innodb/mem/* files on 64-bit Windows + # due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297 + IF(CMAKE_SIZEOF_VOID_P MATCHES 8) + SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c + PROPERTIES COMPILE_FLAGS -Od) + ENDIF() + # Avoid "unreferenced label" warning in generated file + SET_SOURCE_FILES_PROPERTIES(pars/pars0grm.c + PROPERTIES COMPILE_FLAGS "/wd4102") + SET_SOURCE_FILES_PROPERTIES(pars/lexyy.c + PROPERTIES COMPILE_FLAGS "/wd4003") +ENDIF() SET(XTRADB_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c diff --git a/storage/xtradb/include/fsp0types.h b/storage/xtradb/include/fsp0types.h index 2dd2deca671..6678dacb547 100644 --- a/storage/xtradb/include/fsp0types.h +++ b/storage/xtradb/include/fsp0types.h @@ -42,7 +42,7 @@ fseg_alloc_free_page) */ /* @} */ /** File space extent size (one megabyte) in pages */ -#define FSP_EXTENT_SIZE (1u << (20 - UNIV_PAGE_SIZE_SHIFT)) +#define FSP_EXTENT_SIZE (1ULL << (20 - UNIV_PAGE_SIZE_SHIFT)) /** On a page of any file segment, data may be put starting from this offset */ |