diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 09:47:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 09:47:14 +0300 |
| commit | 50de71b026ddb560db2be14a06897874a5732dac (patch) | |
| tree | 576632c133864dca617a3e9f9855937c1ecae897 /cmake | |
| parent | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (diff) | |
| parent | d6d3d9ae2ffb1df8eebfe0c922394bbc7b12e4ed (diff) | |
| download | mariadb-git-50de71b026ddb560db2be14a06897874a5732dac.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 149fdad231f..bbf68add7d7 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -89,6 +89,7 @@ SET(HAVE_LRAND48 CACHE INTERNAL "") SET(HAVE_LSTAT CACHE INTERNAL "") SET(HAVE_MADVISE CACHE INTERNAL "") SET(HAVE_MALLINFO CACHE INTERNAL "") +SET(HAVE_MALLINFO2 CACHE INTERNAL "") SET(HAVE_MALLOC_H 1 CACHE INTERNAL "") SET(HAVE_MEMALIGN CACHE INTERNAL "") SET(HAVE_MEMCPY 1 CACHE INTERNAL "") |