summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2018-09-21 08:37:42 +0400
committerAlexander Barkov <bar@mariadb.com>2018-09-21 08:37:42 +0400
commit80bcb05b2451b89dd7e1355c9fde97c115b4bcb3 (patch)
tree05ea9ab3270e356039b90b1ab1ec12c5fa143b98 /sql/sql_acl.cc
parent327b2717219aaa8f9033895a2351a6ccd4655116 (diff)
parente07118946a82af60c7cc3804c321d3fd9a49f128 (diff)
downloadmariadb-git-80bcb05b2451b89dd7e1355c9fde97c115b4bcb3.tar.gz
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index fa0f4ad1563..8eefddf57cc 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -9950,9 +9950,8 @@ bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name,
combo->user.str= (char *) sctx->priv_user;
mysql_mutex_lock(&acl_cache->lock);
-
- if ((au= find_user_wild(combo->host.str= (char *) sctx->priv_host,
- combo->user.str)))
+ if ((au= find_user_exact(combo->host.str= (char *) sctx->priv_host,
+ combo->user.str)))
goto found_acl;
mysql_mutex_unlock(&acl_cache->lock);