Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

MariaDB · Mar 29, 2017 · fb43180 · fb43180
2 parents 48c59f3 + c5520a3
commit fb43180
Show file tree

Hide file tree

Showing 72 changed files with 3,637 additions and 2,833 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -154,7 +154,6 @@ INCLUDE(ssl)
 INCLUDE(readline)
 INCLUDE(libutils)
 INCLUDE(dtrace)
-INCLUDE(jemalloc)
 INCLUDE(pcre)
 INCLUDE(ctest)
 INCLUDE(plugin)
@@ -313,7 +312,7 @@ IF(NOT HAVE_CXX_NEW)
 ENDIF()
 
 # Find header files from the bundled libraries
-# (jemalloc, yassl, readline, pcre, etc)
+# (yassl, readline, pcre, etc)
 # before the ones installed in the system
 SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 
@@ -329,7 +328,6 @@ MYSQL_CHECK_SSL()
 MYSQL_CHECK_READLINE()
 
 SET(MALLOC_LIBRARY "system")
-CHECK_JEMALLOC()
 
 CHECK_PCRE()