diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-16 10:51:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-16 10:51:20 +0300 |
| commit | c221bcdce7714a74b89a02de941e8d8df2994ce3 (patch) | |
| tree | 87a4e2d595ea3cc1465f212f26a9b9030655aa0c /storage/rocksdb/ha_rocksdb.cc | |
| parent | 3bbf008096fc997556459442bc2503c504248345 (diff) | |
| parent | 395e1dcd176bbf0fcdb5d156bc58604590245a26 (diff) | |
| download | mariadb-git-c221bcdce7714a74b89a02de941e8d8df2994ce3.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/rocksdb/ha_rocksdb.cc')
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 8ef8c349e9f..1929c5235f7 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -5836,11 +5836,11 @@ static int rocksdb_done_func(void *const p) { // Disown the cache data since we're shutting down. // This results in memory leaks but it improved the shutdown time. // Don't disown when running under valgrind -#ifndef HAVE_purify +#ifndef HAVE_valgrind if (rocksdb_tbl_options->block_cache) { rocksdb_tbl_options->block_cache->DisownData(); } -#endif /* HAVE_purify */ +#endif /* HAVE_valgrind */ /* MariaDB: don't clear rocksdb_db_options and rocksdb_tbl_options. |