1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-13403 Mariadb (with TokuDB) excessive memory usage/leak

Browse Source 
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:
Sergei Golubchik 2018-06-12 19:06:55 +02:00
parent be9d923af2
commit 1033fa4bcc
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/control vendored
View File

@ -477,6 +477,7 @@ Description: OQGraph storage engine for MariaDB
Package: mariadb-plugin-tokudb Package: mariadb-plugin-tokudb
Architecture: any Architecture: any
Depends: mariadb-server-10.2 (= ${binary:Version}), Depends: mariadb-server-10.2 (= ${binary:Version}),
libjemalloc1 (>= 3.0.0~),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-server-10.0, Breaks: mariadb-server-10.0,

2
storage/tokudb/CMakeLists.txt
View File

@ -54,7 +54,7 @@ ELSEIF(LIBJEMALLOC STREQUAL jemalloc)
GET_FILENAME_COMPONENT(LIBJEMALLOC_PATH ${LIBJEMALLOC_SO} REALPATH CACHE) GET_FILENAME_COMPONENT(LIBJEMALLOC_PATH ${LIBJEMALLOC_SO} REALPATH CACHE)
ENDIF() ENDIF()
IF(LIBJEMALLOC_PATH AND RPM MATCHES fedora28) # TODO check for jemalloc version IF(LIBJEMALLOC_PATH AND (RPM OR DEB))
UNSET(LIBJEMALLOC) UNSET(LIBJEMALLOC)
GET_DIRECTORY_PROPERTY(V DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITION CPACK_RPM_tokudb-engine_PACKAGE_REQUIRES) 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) SET(CPACK_RPM_tokudb-engine_PACKAGE_REQUIRES "${V} jemalloc" PARENT_SCOPE)

1
storage/tokudb/tokudb.cnf.in
View File

@ -5,5 +5,4 @@
plugin-load-add=ha_tokudb.so plugin-load-add=ha_tokudb.so
[mysqld_safe] [mysqld_safe]
# it might be necessary to uncomment the following line if jemalloc >= 5.0.0
@cnf_malloc_lib@ @cnf_malloc_lib@

1
storage/tokudb/tokudb.conf.in
View File

@ -1,3 +1,2 @@
[Service] [Service]
# it might be necessary to uncomment the following line if jemalloc >= 5.0.0
@systemd_env@ @systemd_env@