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

5.5.40+ merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-10-09 10:30:11 +02:00
parent 689ffe3559 b2d71434ed
commit 1b75bed00f
159 changed files with 1302 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_acl.cc
View File

@ -12132,12 +12132,13 @@ bool acl_authenticate(THD *thd, uint com_change_user_pkt_len)
mpvio.auth_info.authenticated_as);
if (!acl_proxy_user)
{
mysql_mutex_unlock(&acl_cache->lock);
Host_errors errors;
errors.m_proxy_user_acl= 1;
inc_host_errors(mpvio.thd->security_ctx->ip, &errors);
if (!thd->is_error())
login_failed_error(thd);
mysql_mutex_unlock(&acl_cache->lock);
DBUG_RETURN(1);
}
acl_user= acl_proxy_user->copy(thd->mem_root);