1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge from mysql-5.1.

This commit is contained in:
Alexander Nozdrin
2009-10-13 13:42:38 +04:00
172 changed files with 7283 additions and 538 deletions

View File

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