summaryrefslogtreecommitdiff
path: root/storage/tokudb/tokudb.cnf.in
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-06-30 16:39:20 +0200
committerSergei Golubchik <serg@mariadb.org>2018-06-30 16:39:20 +0200
commit36e59752e7fc70bc5179a3d730b5ce3ee58e4e30 (patch)
tree0d3e30ce973b2e1f044931c0eb1846d7192becda /storage/tokudb/tokudb.cnf.in
parent7c0779da7c37f6ef6eff2f79dda6f1b0c57e3869 (diff)
parent1dd3c8f8ba49ec06e550d7376d27ff05ce024bec (diff)
downloadmariadb-git-36e59752e7fc70bc5179a3d730b5ce3ee58e4e30.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/tokudb/tokudb.cnf.in')
-rw-r--r--storage/tokudb/tokudb.cnf.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/tokudb/tokudb.cnf.in b/storage/tokudb/tokudb.cnf.in
index de9b5b711ee..ff7f0a5f5f6 100644
--- a/storage/tokudb/tokudb.cnf.in
+++ b/storage/tokudb/tokudb.cnf.in
@@ -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@