diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:29:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:32:21 +0300 |
| commit | dbc716675b183dc972a40dd1320f4bdae04c1f29 (patch) | |
| tree | 65550afccea8fc9e0d47ba16a679eef44c7dab1a /storage/tokudb | |
| parent | e3f44d8d0eb0277312391686672f81a460094917 (diff) | |
| parent | c0fca2863bcbd7cd231f1aa747b4f8d999e3a00e (diff) | |
| download | mariadb-git-dbc716675b183dc972a40dd1320f4bdae04c1f29.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/tokudb')
| -rw-r--r-- | storage/tokudb/PerconaFT/ftcxx/tests/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/tokudb/PerconaFT/ftcxx/tests/CMakeLists.txt b/storage/tokudb/PerconaFT/ftcxx/tests/CMakeLists.txt index 6f9146ce5b2..b4db82ffff5 100644 --- a/storage/tokudb/PerconaFT/ftcxx/tests/CMakeLists.txt +++ b/storage/tokudb/PerconaFT/ftcxx/tests/CMakeLists.txt @@ -2,9 +2,9 @@ include_directories(..) include_directories(../../src) include_directories(../../src/tests) -find_library(JEMALLOC_STATIC_LIBRARY libjemalloc.a) - if (BUILD_TESTING) + find_library(JEMALLOC_STATIC_LIBRARY libjemalloc.a) + ## reference implementation with simple size-doubling buffer without ## jemalloc size tricks add_library(doubling_buffer_ftcxx STATIC |