diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 21:17:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 21:17:16 +0200 |
| commit | 8cc15c036dbc5fefb025eb957f4d312d41659163 (patch) | |
| tree | 6c4d67d677e6bb9bc90b7e3f08d18c8a798680b6 /sql/threadpool_generic.cc | |
| parent | cc28947315887f55814cb8bc4e68d4e2fe6c65e6 (diff) | |
| parent | b86e0f25f896285a34c999515ad50e50d879f3e7 (diff) | |
| download | mariadb-git-8cc15c036dbc5fefb025eb957f4d312d41659163.tar.gz | |
Merge 10.4 into 10.5
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 768dbab4e6b..e11a0613425 100644 --- a/sql/threadpool_generic.cc +++ b/sql/threadpool_generic.cc @@ -1237,7 +1237,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 |