diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
| commit | 2ba7ed77aab05004f0c853a77850e325b78a1892 (patch) | |
| tree | 943659d76215e16d0d1946c28683c562debeff34 /sql/sql_acl.cc | |
| parent | 63f0669fd6dc430b60ffd5de0bff9854622a1c1a (diff) | |
| parent | 1bb66ea88c4679d6bd3ad1472d75983e66f679ae (diff) | |
| download | mariadb-git-2ba7ed77aab05004f0c853a77850e325b78a1892.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index eff54602536..2bcd351ae32 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -10267,6 +10267,8 @@ acl_check_proxy_grant_access(THD *thd, const char *host, const char *user, DBUG_RETURN(FALSE); } + mysql_mutex_lock(&acl_cache->lock); + /* check for matching WITH PROXY rights */ for (uint i=0; i < acl_proxy_users.elements; i++) { @@ -10279,10 +10281,12 @@ acl_check_proxy_grant_access(THD *thd, const char *host, const char *user, proxy->get_with_grant()) { DBUG_PRINT("info", ("found")); + mysql_mutex_unlock(&acl_cache->lock); DBUG_RETURN(FALSE); } } + mysql_mutex_unlock(&acl_cache->lock); my_error(ER_ACCESS_DENIED_NO_PASSWORD_ERROR, MYF(0), thd->security_ctx->user, thd->security_ctx->host_or_ip); |