diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /sql/sql_connect.cc | |
| parent | 946dc457facc58517e9c47f1c5ad0029e529da79 (diff) | |
| parent | 32e51de7f58d6f3e82c97fe9ab37d8d8246b762b (diff) | |
| download | mariadb-git-ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d.tar.gz | |
Manual merge from mysql-trunk-merge.
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 4ae267a880c..bbb75984b5d 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -977,7 +977,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); } |