database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-16 00:42:55 +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

3
mysys/my_handler_errors.h
View File

@ -88,7 +88,4 @@ static const char *handler_error_messages[]=
"Disk full"
};
extern void my_handler_error_register(void);
extern void my_handler_error_unregister(void);
#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */

11
sql/mysqld.cc
View File

@ -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();

10
sql/sql_class.cc
View File

@ -1528,15 +1528,7 @@ void THD::awake(killed_state state_to_set)
THD_CHECK_SENTRY(this);
mysql_mutex_assert_owner(&LOCK_thd_data);
if (global_system_variables.log_warnings > 3)
{
Security_context *sctx= security_ctx;
sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),
thread_id,(db ? db : "unconnected"),
sctx->user ? sctx->user : "unauthenticated",
sctx->host_or_ip,
"KILLED");
}
print_aborted_warning(3, "KILLED");
/* Set the 'killed' flag of 'this', which is the target THD object. */
killed= state_to_set;

12
sql/sql_class.h
View File

@ -2987,6 +2987,18 @@ public:
LEX_STRING get_invoker_host() { return invoker_host; }
bool has_invoker() { return invoker_user.length > 0; }
void print_aborted_warning(uint threshold, const char *reason)
{
if (global_system_variables.log_warnings > threshold)
{
Security_context *sctx= &main_security_ctx;
sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),
thread_id, (db ? db : "unconnected"),
sctx->user ? sctx->user : "unauthenticated",
sctx->host_or_ip, reason);
}
}
private:
/*
This reference points to the table arena when the expression

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;

9
sql/sql_parse.cc
View File

@ -3751,14 +3751,7 @@ end_with_restore_list:
if (tx_release)
{
thd->killed= KILL_CONNECTION;
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, "RELEASE");
}
thd->print_aborted_warning(3, "RELEASE");
}
my_ok(thd);
break;