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

small cleanup

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-28 23:15:12 +01:00
parent b27d93f347
commit ec38c1bbd7
6 changed files with 19 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_connect.cc
View File

@ -1072,20 +1072,8 @@ void end_connection(THD *thd)
status_var_increment(thd->status_var.lost_connections);
}
if (net->error && net->vio != 0)
{
if (!thd->killed && thd->variables.log_warnings > 1)
{
Security_context *sctx= thd->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,
(thd->stmt_da->is_error() ? thd->stmt_da->message() :
ER(ER_UNKNOWN_ERROR)));
}
}
if (!thd->killed && (net->error && net->vio != 0))
thd->print_aborted_warning(1, ER(ER_UNKNOWN_ERROR));
}
@ -1116,10 +1104,7 @@ void prepare_new_connection_state(THD* thd)
if (thd->is_error())
{
thd->killed= KILL_CONNECTION;
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, "init_connect command failed");
thd->print_aborted_warning(0, "init_connect command failed");
sql_print_warning("%s", thd->stmt_da->message());
}
thd->proc_info=0;