diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2014-05-10 15:53:31 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2014-05-10 15:53:31 -0400 |
| commit | 39b08e022202a8a8d7069dedafcb3e8c7754bf49 (patch) | |
| tree | 578b411cf39b793c32b47462cc74793b1614ed85 | |
| parent | fb9681b9572941dc5cc545f7922ef68909a86909 (diff) | |
| download | mariadb-git-39b08e022202a8a8d7069dedafcb3e8c7754bf49.tar.gz | |
#232 compile in jemalloc detector
| -rw-r--r-- | storage/tokudb/hatoku_defines.h | 4 | ||||
| -rw-r--r-- | storage/tokudb/hatoku_hton.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h index cf983b5b8cb..444ae425b2d 100644 --- a/storage/tokudb/hatoku_defines.h +++ b/storage/tokudb/hatoku_defines.h @@ -96,6 +96,10 @@ PATENT RIGHTS GRANT: #pragma interface /* gcc class implementation */ #endif +#if !defined(TOKUDB_CHECK_JEMALLOC) +#define TOKUDB_CHECK_JEMALLOC 1 +#endif + #if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099 // mariadb 10.0 #define TOKU_USE_DB_TYPE_TOKUDB 1 diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index bf7319b1203..9a6eef92d6a 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -576,9 +576,6 @@ static int tokudb_done_func(void *p) { toku_global_status_rows = NULL; my_hash_free(&tokudb_open_tables); tokudb_pthread_mutex_destroy(&tokudb_mutex); -#if defined(_WIN64) - toku_ydb_destroy(); -#endif TOKUDB_DBUG_RETURN(0); } |