diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-04-28 10:32:56 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-04-28 10:32:56 +0300 |
| commit | a34fc634658ce1b2ba63a45ee6bad4355a390439 (patch) | |
| tree | 2420ece2919824dc5183a5aa772da0153ad2a123 /sql/sql_base.cc | |
| parent | 31dc4b3c83917c48ee4882add75143a273a0c98b (diff) | |
| download | mariadb-git-a34fc634658ce1b2ba63a45ee6bad4355a390439.tar.gz | |
Fix for openssl on Solaris
Fix for grant bug with SELECT *
include/my_global.h:
Fix for openssl on Solaris
sql/item_strfunc.cc:
Fix for openssl on Solaris
sql/sql_acl.cc:
Indentation cleanup
sql/sql_base.cc:
Fix for grant bug with SELECT *
sql/sql_parse.cc:
Added comment
tests/grant.pl:
New grant test for SELECT *
tests/grant.res:
new grant results
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index e27ccf55543..0f0c3c97ed2 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1984,8 +1984,9 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, (!db_name || !strcmp(tables->db,db_name)))) { /* Ensure that we have access right to all columns */ - if (grant_option && !thd->master_access && - check_grant_all_columns(thd,SELECT_ACL,table) ) + if (grant_option && !(table->grant.privilege & + table->grant.want_privilege) && + check_grant_all_columns(thd,SELECT_ACL,table)) DBUG_RETURN(-1); Field **ptr=table->field,*field; thd->used_tables|=table->map; |