diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-28 23:15:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-28 23:15:12 +0100 |
| commit | ec38c1bbd709da99fb84e2889f4443247fccfb30 (patch) | |
| tree | 0324b7ee684e170c655f4f9d1472282ddc589f7c /sql/mysqld.cc | |
| parent | b27d93f3471c2e06347d0c918a8ada20f6168191 (diff) | |
| download | mariadb-git-ec38c1bbd709da99fb84e2889f4443247fccfb30.tar.gz | |
small cleanup
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index da496f0a67d..c43f516fc2e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2340,15 +2340,8 @@ void close_connection(THD *thd, uint sql_errno) if (sql_errno) net_send_error(thd, sql_errno, ER_DEFAULT(sql_errno), NULL); - if (global_system_variables.log_warnings > 3) - { - Security_context *sctx= &thd->main_security_ctx; - sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION), - thd->thread_id,(thd->db ? thd->db : "unconnected"), - sctx->user ? sctx->user : "unauthenticated", - sctx->host_or_ip, - (sql_errno ? ER(sql_errno) : "CLOSE_CONNECTION")); - } + thd->print_aborted_warning(3, sql_errno ? ER_DEFAULT(sql_errno) + : "CLOSE_CONNECTION"); thd->disconnect(); |