database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

removed one more hack that - as usual - almost always worked

Browse Source 
(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636
This commit is contained in:
serg@serg.mylan
2003-10-24 23:27:21 +02:00
parent 6457b89948
commit c752d2cad0
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_db.cc
View File

@ -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)))
{