diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-22 22:06:01 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-22 22:06:01 +0400 |
| commit | 564952afb01fa9ff1d6f4622c0f4fb35ccc037cb (patch) | |
| tree | 85bcbfa3559990f90ce21638ed46531ed888aaa3 /sql/sql_connect.cc | |
| parent | ffde6bbb15b75c94293784fa0f4264d64039f0b9 (diff) | |
| parent | bcaa7524d935464c68e34cb0657cd43517108c40 (diff) | |
| download | mariadb-git-564952afb01fa9ff1d6f4622c0f4fb35ccc037cb.tar.gz | |
Automerge from mysql-next-mr.
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index cfcf2af3d09..742bafed0c1 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -989,7 +989,7 @@ static void end_connection(THD *thd) if (thd->user_connect) decrease_user_connections(thd->user_connect); - if (thd->killed || net->error && net->vio != 0) + if (thd->killed || (net->error && net->vio != 0)) { statistic_increment(aborted_threads,&LOCK_status); } |