diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-03-31 22:17:10 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-03-31 22:17:10 +0400 |
| commit | e6d766154709c920c010a96fb8d10295cd694dbc (patch) | |
| tree | 955a27f6963da17e12ea042cedc8a8ced053e0e6 /sql/sql_acl.cc | |
| parent | 0dd6f77d47a9fbb857cf906ed025ebbc44137116 (diff) | |
| parent | d2906f0ed07bc06161d749d03ffa8acb7c09c785 (diff) | |
| download | mariadb-git-e6d766154709c920c010a96fb8d10295cd694dbc.tar.gz | |
Merge of fix for bug #2050 and bug #3307
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Manual merge
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index ef5036bb9f1..3add540f9a9 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2194,8 +2194,10 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list, DBUG_RETURN(-1); while ((column = column_iter++)) { + uint unused_field_idx= NO_CACHED_FIELD_INDEX; if (!find_field_in_table(thd,table,column->column.ptr(), - column->column.length(),0,0)) + column->column.length(),0,0, + &unused_field_idx)) { my_error(ER_BAD_FIELD_ERROR, MYF(0), column->column.c_ptr(), table_list->alias); |