diff options
| author | unknown <kostja@bodhi.(none)> | 2007-10-30 20:10:11 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-10-30 20:10:11 +0300 |
| commit | 1430f4ded275728ed747ebe48005c01b40cd3bab (patch) | |
| tree | c2548e816a592f05bae2fef620d54c08c61982e6 /sql/sql_connect.cc | |
| parent | d4d4ba9a9f49a6abc9cd00924e1e33bfd2278b87 (diff) | |
| parent | 2437001234eba37ad821be11052e57f04293d5bd (diff) | |
| download | mariadb-git-1430f4ded275728ed747ebe48005c01b40cd3bab.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc-2
sql/sql_connect.cc:
Manual merge.
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index c4367b2a8fb..8a817e5993a 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -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) { |