diff options
author | Igor Babaev <igor@askmonty.org> | 2012-02-01 15:48:02 -0800 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2012-02-01 15:48:02 -0800 |
commit | 7b79d8a33f56d178c78209f910a0694807a63f8f (patch) | |
tree | 3d4a8131e8688c6599461bfce72bb87c718a53e4 /sql/scheduler.cc | |
parent | 7ed15e6e50aec65560d8988fc5713f1f489b6616 (diff) | |
parent | 81690cf326e09799ca77d9f7bc5601905b706548 (diff) | |
download | mariadb-git-7b79d8a33f56d178c78209f910a0694807a63f8f.tar.gz |
Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.
Diffstat (limited to 'sql/scheduler.cc')
-rw-r--r-- | sql/scheduler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/scheduler.cc b/sql/scheduler.cc index 5b83bb4753e..2f8aa2bef11 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -512,7 +512,7 @@ static void libevent_connection_close(THD *thd) thd->killed= KILL_CONNECTION; // Avoid error messages - if (thd->net.vio->sd >= 0) // not already closed + if (thd->net.vio->type != VIO_CLOSED) // not already closed { end_connection(thd); close_connection(thd, 0, 1); |