database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-12-27 13:05:06 +02:00
parent ee9a19fb05 16bce0f6fe
commit 5ab70e7f68
60 changed files with 844 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/threadpool_generic.cc
View File

@ -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