diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 10:00:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 10:00:49 +0100 |
| commit | abf9d35213ba482a3927651ddb98baa47aeb34fd (patch) | |
| tree | 567bee47df18c21d5fbc09bbb4fee4e8f26df4d9 /sql/sql_acl.cc | |
| parent | 50a796dcba2abe5f25c1e4cd8a69d7ea43343a8d (diff) | |
| parent | 40ae1b9b618fbbc3b494a896a9d074b74e414337 (diff) | |
| download | mariadb-git-abf9d35213ba482a3927651ddb98baa47aeb34fd.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
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 4588c741cb4..da7c3f17c63 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -7326,6 +7326,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++) { @@ -7338,10 +7340,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); |