diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-05-08 00:12:46 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-05-08 00:12:46 +0300 |
| commit | 97eef79b023c6210e3aea69a750383b2db748c68 (patch) | |
| tree | 60b20adcf362b4f6c7b1eca99610284503335375 /sql/sql_base.cc | |
| parent | 4d91444b15a9d156875b4ba7df2efc301e10845b (diff) | |
| parent | a57e7732897ee7973d82dccea0425c436845066a (diff) | |
| download | mariadb-git-97eef79b023c6210e3aea69a750383b2db748c68.tar.gz | |
Merge to get security patch
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
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index f0aa8e9c351..03a1975b52a 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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) { |