diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-29 22:21:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-29 22:21:19 +0300 |
| commit | e9aaa10c116370ca581bd1b6f7cc360b43938674 (patch) | |
| tree | 49620196fc57cba1180ffee48695618ec1a36417 /sql/mysqld.cc | |
| parent | 19da9a51ae174785806c87bcc8fa47406af9ed96 (diff) | |
| parent | 38ea795bb622cce6f7178291ed737ca7396a124a (diff) | |
| download | mariadb-git-e9aaa10c116370ca581bd1b6f7cc360b43938674.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 57eee46a21a..ad6b64a3454 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -351,7 +351,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; |