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_generic.h | |
| parent | aae3f921adec9b9d1bff093c9a75a94e44f5c8d4 (diff) | |
| parent | e2f1f88fa60680cb87833a7cceb172f5d436a804 (diff) | |
| download | mariadb-git-37c14690fc6bc9237bdad9b8e26157d1174a49fc.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/threadpool_generic.h')
| -rw-r--r-- | sql/threadpool_generic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/threadpool_generic.h b/sql/threadpool_generic.h index 5f923bc0652..64aa67c40d3 100644 --- a/sql/threadpool_generic.h +++ b/sql/threadpool_generic.h @@ -1,4 +1,4 @@ -/* Copyright(C) 2019 MariaDB +/* Copyright(C) 2019, 2020, MariaDB * * This program is free software; you can redistribute itand /or modify * it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ #include <my_global.h> #include <sql_plist.h> #include <my_pthread.h> -#include <threadpool.h> #include <mysqld.h> +#include <threadpool.h> #include <violite.h> #ifdef _WIN32 |