summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-09-23 20:26:35 +0200
committerSergei Golubchik <serg@mariadb.org>2018-09-24 11:46:08 +0200
commit5ae8fce50bb5cbd7916acd6b03bd699f79c10616 (patch)
tree6291ec25e408ea225531e8b79a4f4fd7f3a81329 /sql/sql_acl.cc
parent76098f45b8b1f2224eb25cf5d94450c6f4a1414c (diff)
parent1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b (diff)
downloadmariadb-git-5ae8fce50bb5cbd7916acd6b03bd699f79c10616.tar.gz
Merge branch '10.1' into 10.2
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 75186bb502c..03456b93bea 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -10942,9 +10942,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);