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

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-09-10 09:25:20 +03:00
parent aabd1c8fcb 879c9ddce7
commit da9201dd5b
22 changed files with 415 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/threadpool_win.cc
View File

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