1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge remote-tracking branch 'origin/5.5' into 10.0

This commit is contained in:
Alexander Barkov
2018-09-21 08:37:42 +04:00
23 changed files with 479 additions and 305 deletions

View File

@@ -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);