Merge branch 'master' into releases/tokudb-7.5

4555904b · Rich Prohaska · a4e20cfd · 3fbe68e6 · 4555904b
Commit 4555904b authored Nov 14, 2014 by Rich Prohaska
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

scripts/make.mysql.bash scripts/make.mysql.bash +1 -0

No files found.
--- a/scripts/make.mysql.bash
+++ b/scripts/make.mysql.bash
@@ -156,6 +156,7 @@ function generate_cmake_cmd () {
        -D CMAKE_BUILD_TYPE=$cmake_build_type \
        -D CMAKE_TOKUDB_REVISION=$ft_revision \
        -D TOKUDB_VERSION=tokudb-${tokudb_version} \
+        -D WITH_JEMALLOC=bundled \
        -D BUILD_TESTING=OFF \
        -D USE_GTAGS=OFF \
        -D USE_CTAGS=OFF \