diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-22 12:05:53 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 15:56:40 +0200 |
| commit | cceb965a7918c1e3a29965fe0b440cf051764358 (patch) | |
| tree | 57d9d9e71d0145f2801b5cc3d8581701fe46e286 /storage | |
| parent | 6af37ba881fee7e6f651d5e0730c9374337ad1b4 (diff) | |
| download | mariadb-git-cceb965a7918c1e3a29965fe0b440cf051764358.tar.gz | |
Revert "MDEV-12445 : Rocksdb does not shutdown worker threads and aborts in memleak check on server shutdown"
This reverts commit 6f1f9114971c3c158e9ac97313c92a24f6554415.
because it doesn't do anything now (the server doesn't check
my_disable_leak_check) and it never did anything before
(because without `extern` it simply created a local instance of
my_disable_leak_check, did not affect server's my_disable_leak_check).
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index bf9183d7dea..5cbe4c162a8 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -114,7 +114,6 @@ int thd_binlog_format(const MYSQL_THD thd); bool thd_binlog_filter_ok(const MYSQL_THD thd); } -MYSQL_PLUGIN_IMPORT bool my_disable_leak_check; extern my_bool opt_core_file; // Needed in rocksdb_init_func @@ -5688,13 +5687,6 @@ static int rocksdb_init_func(void *const p) { } #endif - /** - Rocksdb does not always shutdown its threads, when - plugin is shut down. Disable server's leak check - at exit to avoid crash. - */ - my_disable_leak_check = true; - err = my_error_register(rdb_get_error_messages, HA_ERR_ROCKSDB_FIRST, HA_ERR_ROCKSDB_LAST); if (err != 0) { |