diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-27 17:54:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-27 17:54:47 +0300 |
| commit | b7b0bc8f11c7cbbc690fa9b704ab3b0f62a77785 (patch) | |
| tree | b61eb8fc52031d2cd0cf2f05261dc5d80f7317fb /config.h.cmake | |
| parent | bb702c2e4c24632678b548ee1515c6a5b8173808 (diff) | |
| parent | f5c080c7353cc9c30d0b269c07024cd38253c3bc (diff) | |
| download | mariadb-git-b7b0bc8f11c7cbbc690fa9b704ab3b0f62a77785.tar.gz | |
Merge 10.3 into 10.4
We omit the work-around commit 0b7fa5a05deecaf52207f00bb02b5c6b460abb11
because it appears to be needed for CentOS 6 only,
which we no longer support.
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config.h.cmake b/config.h.cmake index 78fe1d9498f..22509b2cf93 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -186,8 +186,6 @@ #cmakedefine HAVE_POSIX_FALLOCATE 1 #cmakedefine HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE 1 #cmakedefine HAVE_PREAD 1 -#cmakedefine HAVE_PAUSE_INSTRUCTION 1 -#cmakedefine HAVE_FAKE_PAUSE_INSTRUCTION 1 #cmakedefine HAVE_RDTSCLL 1 #cmakedefine HAVE_READ_REAL_TIME 1 #cmakedefine HAVE_PTHREAD_ATTR_CREATE 1 |