diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-04-30 18:56:55 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-04-30 18:56:55 +0200 |
| commit | da1fbcb665194595e9f46756d8974edd91ce457b (patch) | |
| tree | 9007a7172d0915dd15da048318a46e860db35837 /storage | |
| parent | 23c6fb3e6231b8939331e2d9f157092f24ed8f4f (diff) | |
| parent | 15db581ecb871efedeb83a10c2edbbbb6e8da784 (diff) | |
| download | mariadb-git-da1fbcb665194595e9f46756d8974edd91ce457b.tar.gz | |
Merge branch 'merge-tokudb-5.6' into 10.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/PerconaFT/portability/portability.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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) |