diff options
| author | unknown <serg@serg.mylan> | 2003-10-24 23:53:53 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-24 23:53:53 +0200 |
| commit | d8d642314cce9d0e9ea766a9d584529da6e59f18 (patch) | |
| tree | 292e9130703b26351ca29ed0a02fe7f2abbb1bd6 /sql/sql_parse.cc | |
| parent | f38d78943cabc2e8be51522052bb29870057b25f (diff) | |
| parent | ea47b72d150014b2b3633ae9c32b3e98e6288ec5 (diff) | |
| download | mariadb-git-d8d642314cce9d0e9ea766a9d584529da6e59f18.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
sql/sql_parse.cc:
Auto merged
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 50a376148b5..00d7f190fc8 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; |