database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-09-12 12:16:40 +03:00
parent ebddd8699c 9554ef0678
commit 60c04be659
51 changed files with 982 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/threadpool_win.cc
View File

@ -294,6 +294,7 @@ TP_connection_win::~TP_connection_win()
if (timer)
{
SetThreadpoolTimer(timer, 0, 0, 0);
WaitForThreadpoolTimerCallbacks(timer, TRUE);
CloseThreadpoolTimer(timer);
}