Skip to content

Commit cceb965

Browse files
committed
Revert "MDEV-12445 : Rocksdb does not shutdown worker threads and aborts in memleak check on server shutdown"
This reverts commit 6f1f911. 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).
1 parent 6af37ba commit cceb965

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

sql/mysqld.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ static bool volatile select_thread_in_use, signal_thread_in_use;
365365
static volatile bool ready_to_exit;
366366
static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
367367
static my_bool opt_short_log_format= 0, opt_silent_startup= 0;
368-
bool my_disable_leak_check= false;
369368

370369
uint kill_cached_threads;
371370
static uint wake_thread;

storage/rocksdb/ha_rocksdb.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ int thd_binlog_format(const MYSQL_THD thd);
114114
bool thd_binlog_filter_ok(const MYSQL_THD thd);
115115
}
116116

117-
MYSQL_PLUGIN_IMPORT bool my_disable_leak_check;
118117
extern my_bool opt_core_file;
119118

120119
// Needed in rocksdb_init_func
@@ -5688,13 +5687,6 @@ static int rocksdb_init_func(void *const p) {
56885687
}
56895688
#endif
56905689

5691-
/**
5692-
Rocksdb does not always shutdown its threads, when
5693-
plugin is shut down. Disable server's leak check
5694-
at exit to avoid crash.
5695-
*/
5696-
my_disable_leak_check = true;
5697-
56985690
err = my_error_register(rdb_get_error_messages, HA_ERR_ROCKSDB_FIRST,
56995691
HA_ERR_ROCKSDB_LAST);
57005692
if (err != 0) {

0 commit comments

Comments
 (0)