diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2015-11-12 10:33:04 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-10 17:46:51 -0500 |
| commit | 1ce821b509cdce915d8dd76b1e080bd26fa2a296 (patch) | |
| tree | f1b146bc4058fa4770584574f98516f2bf54ef8c | |
| parent | bd1d2b90a77f31c7d982f18902a39a2cadce0cc3 (diff) | |
| download | mariadb-git-1ce821b509cdce915d8dd76b1e080bd26fa2a296.tar.gz | |
Refs codership/mysql-wsrep#221
- disabling certain IB atomic builtins, which caused complete hangs
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index cc494a7cd7a..603455196fc 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -119,12 +119,16 @@ IF(NOT CMAKE_CROSSCOMPILING) ENDIF() IF(HAVE_IB_GCC_ATOMIC_BUILTINS) +IF(NOT WITH_WSREP) ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS=1) ENDIF() +ENDIF() IF(HAVE_IB_GCC_ATOMIC_TEST_AND_SET) +IF(NOT WITH_WSREP) ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_TEST_AND_SET=1) ENDIF() +ENDIF() IF(HAVE_IB_GCC_SYNC_SYNCHRONISE) ADD_DEFINITIONS(-DHAVE_IB_GCC_SYNC_SYNCHRONISE=1) |