MDEV-13403 Mariadb (with TokuDB) excessive memory usage/leak
In RPM/DEB packages - always ld-preload jemalloc, instead of linking ha_tokudb.so with it. Keep linking in bintars, because they don't install cnf files in the correct locations.
This commit is contained in:
parent
be9d923af2
commit
1033fa4bcc
1
debian/control
vendored
1
debian/control
vendored
@ -477,6 +477,7 @@ Description: OQGraph storage engine for MariaDB
|
||||
Package: mariadb-plugin-tokudb
|
||||
Architecture: any
|
||||
Depends: mariadb-server-10.2 (= ${binary:Version}),
|
||||
libjemalloc1 (>= 3.0.0~),
|
||||
${misc:Depends},
|
||||
${shlibs:Depends}
|
||||
Breaks: mariadb-server-10.0,
|
||||
|
@ -54,7 +54,7 @@ ELSEIF(LIBJEMALLOC STREQUAL jemalloc)
|
||||
GET_FILENAME_COMPONENT(LIBJEMALLOC_PATH ${LIBJEMALLOC_SO} REALPATH CACHE)
|
||||
ENDIF()
|
||||
|
||||
IF(LIBJEMALLOC_PATH AND RPM MATCHES fedora28) # TODO check for jemalloc version
|
||||
IF(LIBJEMALLOC_PATH AND (RPM OR DEB))
|
||||
UNSET(LIBJEMALLOC)
|
||||
GET_DIRECTORY_PROPERTY(V DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITION CPACK_RPM_tokudb-engine_PACKAGE_REQUIRES)
|
||||
SET(CPACK_RPM_tokudb-engine_PACKAGE_REQUIRES "${V} jemalloc" PARENT_SCOPE)
|
||||
|
@ -5,5 +5,4 @@
|
||||
plugin-load-add=ha_tokudb.so
|
||||
|
||||
[mysqld_safe]
|
||||
# it might be necessary to uncomment the following line if jemalloc >= 5.0.0
|
||||
@cnf_malloc_lib@
|
||||
|
@ -1,3 +1,2 @@
|
||||
[Service]
|
||||
# it might be necessary to uncomment the following line if jemalloc >= 5.0.0
|
||||
@systemd_env@
|
||||
|
Loading…
x
Reference in New Issue
Block a user