diff options
| author | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-08-23 09:07:09 +0530 |
|---|---|---|
| committer | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-08-23 09:07:09 +0530 |
| commit | 292aa926c15f31936ee14bf11dd791847fd7b74d (patch) | |
| tree | 01a2e2f69168201021668f8d6144a6aa701c61ad /sql/sql_parse.cc | |
| parent | 6613734b1abd5b6572963c14034bb64c6d923894 (diff) | |
| parent | e879caf845f3f1209eb2065fc4463a293ad9518c (diff) | |
| download | mariadb-git-292aa926c15f31936ee14bf11dd791847fd7b74d.tar.gz | |
WL#7076: Backporting wl6715 to support both formats
in 5.5, 5.6, 5.7.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7e510fb1d50..f787fe4058f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4837,8 +4837,8 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv, if (!(sctx->master_access & SELECT_ACL)) { if (db && (!thd->db || db_is_pattern || strcmp(db, thd->db))) - db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, db, - db_is_pattern); + db_access= acl_get(sctx->get_host()->ptr(), sctx->get_ip()->ptr(), + sctx->priv_user, db, db_is_pattern); else { /* get access for current db */ @@ -4886,8 +4886,8 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv, } if (db && (!thd->db || db_is_pattern || strcmp(db,thd->db))) - db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, db, - db_is_pattern); + db_access= acl_get(sctx->get_host()->ptr(), sctx->get_ip()->ptr(), + sctx->priv_user, db, db_is_pattern); else db_access= sctx->db_access; DBUG_PRINT("info",("db_access: %lu want_access: %lu", |