diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:09:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:27:04 +0200 |
| commit | 349560d5d5e53966fe75eef2bfefd12e29278f6a (patch) | |
| tree | ca1f26f2a2db1c8e2c86b8cbaae00abcebe5f6cf /storage/innobase/innodb.cmake | |
| parent | 2d592f757cd624fe964ac39d05b6bdd985a827e2 (diff) | |
| parent | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (diff) | |
| download | mariadb-git-349560d5d5e53966fe75eef2bfefd12e29278f6a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/innodb.cmake')
| -rw-r--r-- | storage/innobase/innodb.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/innobase/innodb.cmake b/storage/innobase/innodb.cmake index 33b73813b0e..c3698df4c11 100644 --- a/storage/innobase/innodb.cmake +++ b/storage/innobase/innodb.cmake @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2017, MariaDB Corporation. +# Copyright (c) 2017, 2019, MariaDB Corporation. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -146,6 +146,12 @@ IF(HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE) ENDIF() IF(NOT MSVC) + # Work around MDEV-18417, MDEV-18656, MDEV-18417 + IF(WITH_ASAN AND CMAKE_COMPILER_IS_GNUCC AND + CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0") + SET_SOURCE_FILES_PROPERTIES(trx/trx0rec.cc PROPERTIES COMPILE_FLAGS -O1) + ENDIF() + CHECK_FUNCTION_EXISTS(posix_memalign HAVE_POSIX_MEMALIGN) IF(HAVE_POSIX_MEMALIGN) ADD_DEFINITIONS(-DHAVE_POSIX_MEMALIGN) |