5.5 merge

4 files changed, 24 insertions, 11 deletions

diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 28bfcfe6e08..7e5ce563b15 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -124,7 +124,7 @@ IF(UNIX)
   SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
 
   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    SET(WITH_JEMALLOC "yes" CACHE STRING "")
+    SET(WITH_JEMALLOC "static" CACHE STRING "")
 
     IF(NOT IGNORE_AIO_CHECK)
       # Ensure aio is available on Linux (required by InnoDB)
diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake
index f22499cd843..876688f02f6 100644
--- a/cmake/jemalloc.cmake
+++ b/cmake/jemalloc.cmake
@@ -12,13 +12,26 @@ MACRO (CHECK_JEMALLOC)
     SET(WITH_JEMALLOC "yes")
   ENDIF()
 
-  IF(WITH_JEMALLOC STREQUAL "yes" OR WITH_JEMALLOC STREQUAL "auto")
-    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
+  IF(WITH_JEMALLOC STREQUAL "yes" OR WITH_JEMALLOC STREQUAL "auto" OR
+      WITH_JEMALLOC STREQUAL "static")
+
+    IF(WITH_JEMALLOC STREQUAL "static")
+      SET(libname jemalloc_pic)
+      SET(CMAKE_REQUIRED_LIBRARIES pthread dl m)
+      SET(what bundled)
+    ELSE()
+      SET(libname jemalloc)
+      SET(what system)
+    ENDIF()
+
+    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
+    SET(CMAKE_REQUIRED_LIBRARIES)
+
     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC jemalloc)
-      SET(MALLOC_LIBRARY "system jemalloc")
-    ELSEIF (WITH_JEMALLOC STREQUAL "yes")
-      MESSAGE(FATAL_ERROR "jemalloc is not found")
+      SET(LIBJEMALLOC ${libname})
+      SET(MALLOC_LIBRARY "${what} jemalloc")
+    ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
+      MESSAGE(FATAL_ERROR "${libname} is not found")
     ENDIF()
   ENDIF()
 ENDMACRO()
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 2de53c58e25..0a6055a4604 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -147,7 +147,7 @@ Description: MariaDB database client binaries
 
 Package: mariadb-server-core-10.0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}), libjemalloc1 (>= 3.0.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
 Conflicts: mariadb-server-5.1 (<< 5.1.60),
     mariadb-server-5.2 (<< 5.2.10),
@@ -192,7 +192,7 @@ Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}), libjemalloc1 (>= 3.0.0)
+Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version})
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 87b4ff936e5..f7988783ca6 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -147,7 +147,7 @@ Description: MariaDB database client binaries
 
 Package: mariadb-server-core-10.0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}), libjemalloc1 (>= 3.0.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
 Conflicts: mysql-server-5.0,
     mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
@@ -186,7 +186,7 @@ Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}), libjemalloc1 (>= 3.0.0)
+Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version})
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,