summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-01-22 22:45:26 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-01-28 17:39:08 +0400
commit9824ec81aaade5173e59574e2b76bbead9ef9591 (patch)
tree1c44cf0586ba9388d9e34bb7ed0433a458123e3c /sql/mysqld.h
parent3503fbbebf90cb0fe63993a66dad9bf97fb74c0a (diff)
downloadmariadb-git-9824ec81aaade5173e59574e2b76bbead9ef9591.tar.gz
Removed redundant service_thread_count
In contrast to thread_count, which is decremented by THD destructor, this one was most probably intended to be decremented after all THD destructors are done. THD_count class was added to achieve similar effect with thread_count. Aim is to reduce usage of LOCK_thread_count and COND_thread_count. Part of MDEV-15135.
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index a8e2e3cff6c..a969dc5968e 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -86,7 +86,6 @@ void kill_mysql(THD *thd= 0);
void close_connection(THD *thd, uint sql_errno= 0);
void handle_connection_in_main_thread(CONNECT *thd);
void create_thread_to_handle_connection(CONNECT *connect);
-void signal_thd_deleted();
void unlink_thd(THD *thd);
bool one_thread_per_connection_end(THD *thd, bool put_in_cache);
void flush_thread_cache();
@@ -641,7 +640,7 @@ extern mysql_prlock_t LOCK_system_variables_hash;
extern mysql_cond_t COND_thread_count, COND_start_thread;
extern mysql_cond_t COND_manager;
extern mysql_cond_t COND_slave_background;
-extern int32 thread_count, service_thread_count;
+extern Atomic_counter<uint32_t> thread_count;
extern char *opt_ssl_ca, *opt_ssl_capath, *opt_ssl_cert, *opt_ssl_cipher,
*opt_ssl_key, *opt_ssl_crl, *opt_ssl_crlpath;