database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge from mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-10-14 12:25:39 +04:00
parent 946dc457fa 32e51de7f5
commit ca08f10ccd
170 changed files with 7269 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_connect.cc
View File

@ -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);
}