diff options
| author | unknown <serg@serg.mylan> | 2003-10-24 23:27:21 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-24 23:27:21 +0200 |
| commit | ea47b72d150014b2b3633ae9c32b3e98e6288ec5 (patch) | |
| tree | b8897b47e2ad7d929f25f6603752d75cbe47ed29 /sql/sql_parse.cc | |
| parent | e5386bcb6b439b637586adf6c492aadbe570a117 (diff) | |
| download | mariadb-git-ea47b72d150014b2b3633ae9c32b3e98e6288ec5.tar.gz | |
removed one more hack that - as usual - almost always worked
(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index e8870b20d99..aee156ad899 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3376,7 +3376,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv, db_access= thd->db_access; if (!(thd->master_access & SELECT_ACL) && (db && (!thd->db || strcmp(db,thd->db)))) - db_access=acl_get(thd->host, thd->ip, (char*) &thd->remote.sin_addr, + db_access=acl_get(thd->host, thd->ip, thd->priv_user, db, test(want_access & GRANT_ACL)); *save_priv=thd->master_access | db_access; DBUG_RETURN(FALSE); @@ -3396,7 +3396,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv, DBUG_RETURN(FALSE); // Allow select on anything if (db && (!thd->db || strcmp(db,thd->db))) - db_access=acl_get(thd->host, thd->ip, (char*) &thd->remote.sin_addr, + db_access=acl_get(thd->host, thd->ip, thd->priv_user, db, test(want_access & GRANT_ACL)); else db_access=thd->db_access; |