diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-30 18:27:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-30 18:27:02 +0300 |
| commit | e895041ba915b4b01f35755d569038abba06d4a7 (patch) | |
| tree | 47c751ffe9409796c80b46e308680eb3ca95d6fb /mysys | |
| parent | d2660362920a82588508028f263dad9c16f08865 (diff) | |
| parent | 55f4e4800bc5248921b4896f4b92b816e5e4478c (diff) | |
| download | mariadb-git-e895041ba915b4b01f35755d569038abba06d4a7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mysys/my_largepage.c | 4 | ||||
| -rw-r--r-- | mysys/my_static.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index c911cd064cd..6988d66376d 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -64,7 +64,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro") PROPERTIES COMPILE_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/my_timer_cycles.il") ENDIF() -IF(HAVE_LARGE_PAGES) +IF(HAVE_LINUX_LARGE_PAGES) SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_largepage.c) ENDIF() diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c index 59f815a9d87..dab63ae3817 100644 --- a/mysys/my_largepage.c +++ b/mysys/my_largepage.c @@ -15,7 +15,7 @@ #include "mysys_priv.h" -#ifdef HAVE_LARGE_PAGES +#ifdef HAVE_LINUX_LARGE_PAGES #ifdef HAVE_SYS_IPC_H #include <sys/ipc.h> @@ -163,4 +163,4 @@ my_bool my_large_free_int(uchar *ptr) } #endif /* HAVE_DECL_SHM_HUGETLB */ -#endif /* HAVE_LARGE_PAGES */ +#endif /* HAVE_LINUX_LARGE_PAGES */ diff --git a/mysys/my_static.c b/mysys/my_static.c index 08edf2c4200..f2a9fbb7335 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -59,7 +59,7 @@ USED_MEM* my_once_root_block=0; /* pointer to first block */ uint my_once_extra=ONCE_ALLOC_INIT; /* Memory to alloc / block */ /* from my_largepage.c */ -#ifdef HAVE_LARGE_PAGES +#ifdef HAVE_LINUX_LARGE_PAGES my_bool my_use_large_pages= 0; uint my_large_page_size= 0; #endif |