diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 13:05:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 15:14:48 +0200 |
| commit | 5ab70e7f68ba9659dbdd8c71759cfe99ee90ebf2 (patch) | |
| tree | cde569f712505f981e7a43f01e82c600e282c88c /sql/threadpool_generic.cc | |
| parent | ee9a19fb054085fcea006a25ec957e0d5cb01ce8 (diff) | |
| parent | 16bce0f6fe6bcad0091dc45a97a8ac7b33fe9d44 (diff) | |
| download | mariadb-git-5ab70e7f68ba9659dbdd8c71759cfe99ee90ebf2.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/threadpool_generic.cc')
| -rw-r--r-- | sql/threadpool_generic.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/threadpool_generic.cc b/sql/threadpool_generic.cc index be320788aa7..6531ce06360 100644 --- a/sql/threadpool_generic.cc +++ b/sql/threadpool_generic.cc @@ -1336,7 +1336,7 @@ void wait_begin(thread_group_t *thread_group) DBUG_ASSERT(thread_group->connection_count > 0); if ((thread_group->active_thread_count == 0) && - (is_queue_empty(thread_group) || !thread_group->listener)) + (!is_queue_empty(thread_group) || !thread_group->listener)) { /* Group might stall while this thread waits, thus wake |