From cceb965a7918c1e3a29965fe0b440cf051764358 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 22 May 2020 12:05:53 +0200 Subject: 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). --- sql/mysqld.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'sql/mysqld.cc') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5878f4a2286..e40d5c38233 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -365,7 +365,6 @@ static bool volatile select_thread_in_use, signal_thread_in_use; static volatile bool ready_to_exit; static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0; static my_bool opt_short_log_format= 0, opt_silent_startup= 0; -bool my_disable_leak_check= false; uint kill_cached_threads; static uint wake_thread; -- cgit v1.2.1