diff options
| author | serg@serg.mylan <> | 2003-10-24 23:27:21 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2003-10-24 23:27:21 +0200 |
| commit | c752d2cad0672a69945972166b2830da94827a3e (patch) | |
| tree | b8897b47e2ad7d929f25f6603752d75cbe47ed29 /sql/sql_db.cc | |
| parent | 6457b89948c034aa7a65407555d2db73e9ab56fb (diff) | |
| download | mariadb-git-c752d2cad0672a69945972166b2830da94827a3e.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_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index cd0445b42e2..b0f4b4ef574 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -618,8 +618,7 @@ bool mysql_change_db(THD *thd, const char *name) if (test_all_bits(thd->master_access,DB_ACLS)) db_access=DB_ACLS; else - db_access= (acl_get(thd->host,thd->ip,(char*) &thd->remote.sin_addr, - thd->priv_user,dbname,0) | + db_access= (acl_get(thd->host,thd->ip, thd->priv_user,dbname,0) | thd->master_access); if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname))) { @@ -684,8 +683,7 @@ int mysqld_show_create_db(THD *thd, char *dbname, if (test_all_bits(thd->master_access,DB_ACLS)) db_access=DB_ACLS; else - db_access= (acl_get(thd->host,thd->ip,(char*) &thd->remote.sin_addr, - thd->priv_user,dbname,0) | + db_access= (acl_get(thd->host,thd->ip, thd->priv_user,dbname,0) | thd->master_access); if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname))) { |