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

Merge 5.5->5.5-mwl248

Browse Source
This commit is contained in:
Igor Babaev
2012-08-14 12:42:14 -07:00
parent 3116e3ad61 7cc2f8deca
commit 822e5da0d0
201 changed files with 6162 additions and 2267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@ -3029,7 +3029,7 @@ public:
if (global_system_variables.log_warnings > threshold)
{
Security_context *sctx= &main_security_ctx;
sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),
sql_print_warning(ER_THD(this, ER_NEW_ABORTING_CONNECTION),
thread_id, (db ? db : "unconnected"),
sctx->user ? sctx->user : "unauthenticated",
sctx->host_or_ip, reason);