diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 18:52:17 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 19:07:25 +0300 |
commit | 37c14690fc6bc9237bdad9b8e26157d1174a49fc (patch) | |
tree | 490ab3103b3f2dbef654fdd860e891ccde87d93c /sql/threadpool_common.cc | |
parent | aae3f921adec9b9d1bff093c9a75a94e44f5c8d4 (diff) | |
parent | e2f1f88fa60680cb87833a7cceb172f5d436a804 (diff) | |
download | mariadb-git-37c14690fc6bc9237bdad9b8e26157d1174a49fc.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/threadpool_common.cc')
-rw-r--r-- | sql/threadpool_common.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc index 40b230e5392..b0a5d38d5eb 100644 --- a/sql/threadpool_common.cc +++ b/sql/threadpool_common.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2012, 2019, MariaDB Corporation. +/* Copyright (C) 2012, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ #include <sql_audit.h> #include <debug_sync.h> #include <threadpool.h> -#include <my_counter.h> #ifdef WITH_WSREP #include "wsrep_trans_observer.h" |