1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed _always_ true condition

Browse Source
This commit is contained in:
Vicențiu Ciorbaru 2013-10-18 05:11:31 -07:00 committed by Sergei Golubchik
parent fe521dc28e
commit c4c09afb18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@ -5203,8 +5203,8 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
{ {
db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, db, db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, db,
db_is_pattern); db_is_pattern);
if (sctx->priv_role) if (sctx->priv_role[0])
db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern); db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern);
} }
else else
{ {
@ -5252,7 +5252,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
{ {
db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, db, db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, db,
db_is_pattern); db_is_pattern);
if (sctx->priv_role) if (sctx->priv_role[0])
{ {
db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern); db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern);
} }