diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 17:28:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 17:28:08 +0300 |
| commit | 1e3886ae80c44a39ec3e4061b4ea3131cdcef213 (patch) | |
| tree | ce95518792d1432b669ba13a248928e74e81a9bb /sql/sql_acl.cc | |
| parent | 0fe7d8a2a221196d977e5efe3f3dedb22806bb53 (diff) | |
| parent | 3a7201ea922f6d3373924c413fdb4b108f6208c5 (diff) | |
| download | mariadb-git-1e3886ae80c44a39ec3e4061b4ea3131cdcef213.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index d63a2f2bc51..433d48a3de4 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -11698,12 +11698,6 @@ void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant, /* global privileges */ grant->privilege= sctx->master_access; - if (!sctx->priv_user[0] && !sctx->priv_role[0]) - { - DBUG_PRINT("info", ("privilege 0x%lx", grant->privilege)); - DBUG_VOID_RETURN; // it is slave - } - if (!thd->db || strcmp(db, thd->db)) { /* db privileges */ |