diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-12 19:56:29 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-12 19:56:29 +0400 |
| commit | 7c7269d3723a4044816b1f80424af0ff2bc56f3f (patch) | |
| tree | 877f14dd7dcbe276aa07dc26cbe63541bc893aff /sql/scheduler.cc | |
| parent | 45bb808c7ec0a77bb51038ff370753f8ed5c7ddf (diff) | |
| parent | db0aed93482759844af7b39c9bf6e7fe141f28f6 (diff) | |
| download | mariadb-git-7c7269d3723a4044816b1f80424af0ff2bc56f3f.tar.gz | |
merging.
Diffstat (limited to 'sql/scheduler.cc')
| -rw-r--r-- | sql/scheduler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/scheduler.cc b/sql/scheduler.cc index 5b8f834aecc..5b83bb4753e 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -376,7 +376,7 @@ void libevent_kill_thd_callback(int Fd, short, void*) { THD *thd= (THD*)list->data; list= list_rest(list); - if (thd->killed == THD::KILL_CONNECTION) + if ((int) thd->killed >= (int) KILL_CONNECTION) { /* Delete from libevent and add to the processing queue. @@ -510,7 +510,7 @@ static void libevent_connection_close(THD *thd) DBUG_ENTER("libevent_connection_close"); DBUG_PRINT("enter", ("thd: %p", thd)); - thd->killed= THD::KILL_CONNECTION; // Avoid error messages + thd->killed= KILL_CONNECTION; // Avoid error messages if (thd->net.vio->sd >= 0) // not already closed { @@ -531,9 +531,9 @@ static void libevent_connection_close(THD *thd) static bool libevent_should_close_connection(THD* thd) { - return thd->net.error || - thd->net.vio == 0 || - thd->killed == THD::KILL_CONNECTION; + return (thd->net.error || + thd->net.vio == 0 || + (int) thd->killed >= (int) KILL_CONNECTION); } |