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

Merge to get security patch

Browse source 
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_acl.cc:
  Auto merged
tests/grant.pl:
  Auto merged
tests/grant.res:
  Auto merged
BitKeeper/triggers/post-commit:
  use local file
client/mysqldump.c:
  Merge to get crash fix
This commit is contained in:
unknown 2003-05-08 00:12:46 +03:00
commit 97eef79b02
6 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sql/sql_base.cc
View file

@ -1694,7 +1694,7 @@ Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length,
else
thd->dupp_field=field;
}
if (check_grants && check_grant_column(thd,table,name,length))
if (check_grants && check_grant_column(thd,table,name,length))
return WRONG_GRANT;
return field;
}
@ -1719,8 +1719,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 &&
tables->table->grant.want_privilege,
test(tables->table->grant.
want_privilege),
1);
if (find)
{
@ -1760,8 +1760,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 &&
tables->table->grant.want_privilege,
test(tables->table->grant.want_privilege),
allow_rowid);
if (field)
{