diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
commit | ca091e6372c4d1b05d2338e878042c2914519a4e (patch) | |
tree | 406c71091eb4fdf4409147d22e6749309f677e8e /storage/tokudb | |
parent | 28325b08633372cc343dfcbc41fe252020cf6e6e (diff) | |
parent | d233fd14a39f9c583b85ffb03e42b5ea52e2f4c2 (diff) | |
download | mariadb-git-ca091e6372c4d1b05d2338e878042c2914519a4e.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/tokudb')
-rw-r--r-- | storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake | 6 | ||||
-rw-r--r-- | storage/tokudb/PerconaFT/portability/portability.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake index 8f65895cc9c..8b3a0e61418 100644 --- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake @@ -170,9 +170,9 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang) set_cflags_if_supported(-Wcast-align) endif () -## always want these in debug builds -set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror ${CMAKE_C_FLAGS_DEBUG}") -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror ${CMAKE_CXX_FLAGS_DEBUG}") +## never want these +set(CMAKE_C_FLAGS "-Wno-error ${CMAKE_C_FLAGS}") +set(CMAKE_CXX_FLAGS "-Wno-error ${CMAKE_CXX_FLAGS}") # pick language dialect set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}") diff --git a/storage/tokudb/PerconaFT/portability/portability.cc b/storage/tokudb/PerconaFT/portability/portability.cc index 81115a516aa..556a34fb861 100644 --- a/storage/tokudb/PerconaFT/portability/portability.cc +++ b/storage/tokudb/PerconaFT/portability/portability.cc @@ -60,7 +60,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. #if defined(HAVE_SYS_SYSCALL_H) # include <sys/syscall.h> #endif -#if defined(HAVE_SYS_SYSCTL_H) +#if defined(HAVE_SYS_SYSCTL_H) && !defined(_SC_PHYS_PAGES) # include <sys/sysctl.h> #endif #if defined(HAVE_PTHREAD_H) |