mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 01:05:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

merged

Browse source 
man/perror.1:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/analyse.result:
  ul
mysql-test/r/group_by.result:
  ul
mysql-test/r/select.result:
  ul
This commit is contained in:
unknown 2003-03-13 13:44:03 +01:00
commit 50da5c1858
11 changed files with 106 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sql/sql_base.cc
View file

@ -1693,8 +1693,7 @@ Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length,
else
thd->dupp_field=field;
}
if (check_grants && !thd->master_access &&
check_grant_column(thd,table,name,length))
if (check_grants && check_grant_column(thd,table,name,length))
return WRONG_GRANT;
return field;
}
@ -1719,7 +1718,8 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables)
{
found_table=1;
Field *find=find_field_in_table(thd,tables->table,name,length,
grant_option && !thd->master_access,1);
grant_option &&
tables->grant.want_privilege ,1);
if (find)
{
if (find == WRONG_GRANT)
@ -1758,8 +1758,7 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables)
for (; tables ; tables=tables->next)
{
Field *field=find_field_in_table(thd,tables->table,name,length,
grant_option &&
!thd->master_access, allow_rowid);
grant_option && tables->grant.want_privilege ,allow_rowid);
if (field)
{
if (field == WRONG_GRANT)