diff options
| author | unknown <serg@serg.mysql.com> | 2003-03-13 17:57:24 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-03-13 17:57:24 +0100 |
| commit | d2d9910133a8567645aa8390c00bb567f9127289 (patch) | |
| tree | 86e228da4136bed23c85755f356aa805e422792a /sql/sql_base.cc | |
| parent | ace956f49063e27d6d10b5fb5b68e145cd728b41 (diff) | |
| parent | f3eb7fe0c3259b001f77c30844f42f96562c23f1 (diff) | |
| download | mariadb-git-d2d9910133a8567645aa8390c00bb567f9127289.tar.gz | |
merged
sql/sql_base.cc:
Auto merged
tests/grant.res:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 660b37858b5..e27ccf55543 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1719,7 +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->grant.want_privilege ,1); + tables->table->grant.want_privilege, + 1); if (find) { if (find == WRONG_GRANT) @@ -1758,7 +1759,9 @@ 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->grant.want_privilege ,allow_rowid); + grant_option && + tables->table->grant.want_privilege, + allow_rowid); if (field) { if (field == WRONG_GRANT) |