diff options
| author | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2013-10-18 05:11:31 -0700 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 05:11:31 -0700 |
| commit | c4c09afb1826f1d6f719854dc8a8b65e7f0f35fb (patch) | |
| tree | f774098b4972e97313e825218f7e971918db0783 /sql/sql_parse.cc | |
| parent | fe521dc28efe80b9aae45cc4d8f8c3ee6fe4bb52 (diff) | |
| download | mariadb-git-c4c09afb1826f1d6f719854dc8a8b65e7f0f35fb.tar.gz | |
Fixed _always_ true condition
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 90af112810e..ac6ac2763b3 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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_is_pattern); - if (sctx->priv_role) - db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern); + if (sctx->priv_role[0]) + db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern); } 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_is_pattern); - if (sctx->priv_role) + if (sctx->priv_role[0]) { db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern); } |