diff options
| author | unknown <serg@serg.mysql.com> | 2003-03-13 13:44:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-03-13 13:44:03 +0100 |
| commit | 50da5c1858ca2343f950e748991714f2f6813a1e (patch) | |
| tree | 7a057f11634bb468082003e00b9d3a2f310b8d91 /sql/sql_base.cc | |
| parent | a4aaac02f3b50f2009a163d531afb686a03e47dd (diff) | |
| parent | c7551b88408430007ed7c27ed5e9f40f584e29d0 (diff) | |
| download | mariadb-git-50da5c1858ca2343f950e748991714f2f6813a1e.tar.gz | |
merged
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
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 4d1e57f0c1e..660b37858b5 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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) |