summaryrefslogtreecommitdiff
path: root/storage/tokudb/hatoku_hton.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-08-10 19:30:20 +0200
committerSergei Golubchik <serg@mariadb.org>2016-08-10 19:30:20 +0200
commit4f2d2143599bd63889265a6be00d0b8494d525ef (patch)
tree4c1aaa4f27a7d4700bdb32ab1a729bc7d8cea937 /storage/tokudb/hatoku_hton.cc
parentf853a99a4fad0f390d6b1f6c46648302ca6cf310 (diff)
downloadmariadb-git-4f2d2143599bd63889265a6be00d0b8494d525ef.tar.gz
5.6.31-77.0
Diffstat (limited to 'storage/tokudb/hatoku_hton.cc')
-rw-r--r--storage/tokudb/hatoku_hton.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index a8876cddcf0..2b121189e83 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -278,7 +278,6 @@ static int tokudb_init_func(void *p) {
db_env = NULL;
tokudb_hton = (handlerton *) p;
-#if TOKUDB_CHECK_JEMALLOC
if (tokudb::sysvars::check_jemalloc) {
typedef int (*mallctl_type)(
const char*,
@@ -305,7 +304,6 @@ static int tokudb_init_func(void *p) {
goto error;
}
}
-#endif
r = tokudb_set_product_name();
if (r) {
@@ -550,6 +548,8 @@ static int tokudb_init_func(void *p) {
db_env,
tokudb_get_loader_memory_size_callback);
+ db_env->set_check_thp(db_env, tokudb::sysvars::check_jemalloc);
+
r = db_env->open(
db_env,
tokudb_home,