diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 18:20:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 18:20:28 +0200 |
| commit | 4c25e75ce766440694553e0baf03cc5c6e803fc3 (patch) | |
| tree | f75cea6e472054b7a15466ea5e31c862ae9e77cc /sql/threadpool_generic.cc | |
| parent | 4c57ab34d4852387da4ef8eac862045d1458de1e (diff) | |
| parent | 808bc919eb94ac888f2014275b443ebdaf733ae5 (diff) | |
| download | mariadb-git-4c25e75ce766440694553e0baf03cc5c6e803fc3.tar.gz | |
Merge 10.3 into 10.4
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 eb92846ed07..6f8e1982836 100644 --- a/sql/threadpool_generic.cc +++ b/sql/threadpool_generic.cc @@ -1322,7 +1322,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 |