diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-27 13:15:37 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-27 13:15:37 +0300 |
| commit | ab150128ce78fd363f6041277862686a61730b2b (patch) | |
| tree | 1e1a04cc057f5d52eb223266623f32d805444a87 /storage/xtradb/CMakeLists.txt | |
| parent | 9534fd83ce6dc402132cc304c121c9205b430dda (diff) | |
| parent | 20e20f6db6fe7f752cccdb34c1ac1d54c2f30cec (diff) | |
| download | mariadb-git-ab150128ce78fd363f6041277862686a61730b2b.tar.gz | |
MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3880.
Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
Diffstat (limited to 'storage/xtradb/CMakeLists.txt')
| -rw-r--r-- | storage/xtradb/CMakeLists.txt | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index e34add61886..c29888b8b15 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -268,6 +268,27 @@ ENDIF() INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/xtradb/include ${CMAKE_SOURCE_DIR}/storage/xtradb/handler) +IF(WITH_WSREP) + # ssl include directory + INCLUDE_DIRECTORIES(${SSL_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/storage/xtradb/wsrep) + + IF(SSL_DEFINES) + ADD_DEFINITIONS(${SSL_DEFINES}) + ENDIF() + + LINK_LIBRARIES(${SSL_LIBRARIES}) + + # We do RESTRICT_SYMBOL_EXPORTS(yassl) elsewhere. + # In order to get correct symbol visibility, these files + # must be compiled with "-fvisibility=hidden" + IF(WITH_SSL STREQUAL "bundled" AND HAVE_VISIBILITY_HIDDEN) + SET_SOURCE_FILES_PROPERTIES( + {CMAKE_CURRENT_SOURCE_DIR}/wsrep/md5.cc + PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") + ENDIF() +ENDIF() + # Sun Studio bug with -xO2 IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro" AND CMAKE_CXX_FLAGS_RELEASE MATCHES "O2" @@ -409,6 +430,10 @@ SET(INNOBASE_SOURCES ut/ut0wqueue.cc ut/ut0timer.cc) +IF(WITH_WSREP) + SET(INNOBASE_SOURCES ${INNOBASE_SOURCES} wsrep/md5.cc) +ENDIF() + IF(NOT XTRADB_OK) MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform") ENDIF() |