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

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

Browse Source 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc-2
This commit is contained in:
kostja@bodhi.(none)
2007-10-30 20:10:11 +03:00
parent 5a09edd203 e4b353c40c
commit cd72fffa5f
20 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_connect.cc
View File

@ -975,12 +975,12 @@ void end_connection(THD *thd)
decrease_user_connections(thd->user_connect);
if (thd->killed ||
net->error && net->vio != 0 && net->report_error)
net->error && net->vio != 0 && thd->is_error())
{
statistic_increment(aborted_threads,&LOCK_status);
}
if (net->error && net->vio != 0 && net->report_error)
if (net->error && net->vio != 0 && thd->is_error())
{
if (!thd->killed && thd->variables.log_warnings > 1)
{