summaryrefslogtreecommitdiff
path: root/sql/threadpool_unix.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-02-19 20:46:29 +0100
committerSergei Golubchik <serg@mariadb.org>2020-02-19 20:46:29 +0100
commit520c3f69a6caed5524d3214a0339736d673c4c0c (patch)
treee0a642252b655aa78324743242752b6d322df7d9 /sql/threadpool_unix.cc
parent8e02955b8a2c690bdf874c4718c7c4f9b63d1117 (diff)
parent4d1c1b23e1373bbd4e72f524e855f1db076d2c73 (diff)
downloadmariadb-git-520c3f69a6caed5524d3214a0339736d673c4c0c.tar.gz
Merge tag 'mariadb-5.5.67' into 10.0bb-10.0-MDEV-6463
Diffstat (limited to 'sql/threadpool_unix.cc')
-rw-r--r--sql/threadpool_unix.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc
index 25db8bab6d1..7b10785dd17 100644
--- a/sql/threadpool_unix.cc
+++ b/sql/threadpool_unix.cc
@@ -1176,7 +1176,7 @@ void wait_begin(thread_group_t *thread_group)
DBUG_ASSERT(thread_group->connection_count > 0);
if ((thread_group->active_thread_count == 0) &&
- (thread_group->queue.is_empty() || !thread_group->listener))
+ (!thread_group->queue.is_empty() || !thread_group->listener))
{
/*
Group might stall while this thread waits, thus wake