diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-10 09:25:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-10 09:25:20 +0300 |
| commit | da9201dd5bfbd5df68612c33e2b087705d44bec7 (patch) | |
| tree | d6ea900e9f024c0836ca69f001557ac653cfb22a /sql/threadpool_win.cc | |
| parent | aabd1c8fcbd19b9b0ec0fddea7071d815a984b12 (diff) | |
| parent | 879c9ddce7fd89f06f538e380016b408e4f2a2f4 (diff) | |
| download | mariadb-git-da9201dd5bfbd5df68612c33e2b087705d44bec7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/threadpool_win.cc')
| -rw-r--r-- | sql/threadpool_win.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/threadpool_win.cc b/sql/threadpool_win.cc index bede98f8211..ce0ea2252c1 100644 --- a/sql/threadpool_win.cc +++ b/sql/threadpool_win.cc @@ -305,6 +305,7 @@ TP_connection_win::~TP_connection_win() if (timer) { + SetThreadpoolTimer(timer, 0, 0, 0); WaitForThreadpoolTimerCallbacks(timer, TRUE); CloseThreadpoolTimer(timer); } |