diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-05-03 02:47:06 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-05-03 02:47:06 +0200 |
| commit | 550d6871a5eb93013435055e11a4fe3009490c82 (patch) | |
| tree | fc9c5e7298f04b9413d7638a0cf320b92b0b9c65 /sql/threadpool_win.cc | |
| parent | 4cae07968c3d112adc1d7c16b6baf923d9a039a5 (diff) | |
| download | mariadb-git-550d6871a5eb93013435055e11a4fe3009490c82.tar.gz | |
MDEV-246 - Aborted_clients incremented during ordinary connection close
The problem was increment of aborted_threads variable due to thd->killed which was set when threadpool connection was terminated . The fix is not to set thd->killed anymore, there is no real reason for doing it..
Added a test that checks that status variable aborted_clients does not grow for ordinary disconnects, and that successful KILL increments this variable.
Diffstat (limited to 'sql/threadpool_win.cc')
| -rw-r--r-- | sql/threadpool_win.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/threadpool_win.cc b/sql/threadpool_win.cc index c8cc38e612a..6359f81cd2b 100644 --- a/sql/threadpool_win.cc +++ b/sql/threadpool_win.cc @@ -573,6 +573,10 @@ static VOID CALLBACK io_completion_callback(PTP_CALLBACK_INSTANCE instance, } connection_t *connection = (connection_t*)context; + + if (io_result != ERROR_SUCCESS) + goto error; + THD *thd= connection->thd; ulonglong old_timeout = connection->timeout; connection->timeout = ULONGLONG_MAX; |