diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-09-27 12:32:59 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-09-27 12:32:59 +0300 |
| commit | 2e57478d9278b7b84b6bbbe6368a4fd8f68039c4 (patch) | |
| tree | 72a3e5f03123ab2e82f6a6914420c1fd8ba57fe2 /sql/sql_acl.h | |
| parent | 4f6658967b40f88cbf0742066888d626812fec56 (diff) | |
| parent | 500d856faf5dca0eb2731617fb11c09b83e3ef0d (diff) | |
| download | mariadb-git-2e57478d9278b7b84b6bbbe6368a4fd8f68039c4.tar.gz | |
merged the fix for bug 30468 to 5.1-opt
mysql-test/t/grant2.test:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index cba283ec65b..a279c26c2e4 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -244,9 +244,8 @@ bool check_grant_column (THD *thd, GRANT_INFO *grant, const char *name, uint length, Security_context *sctx); bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref, const char *name, uint length); -bool check_grant_all_columns(THD *thd, ulong want_access, GRANT_INFO *grant, - const char* db_name, const char *table_name, - Field_iterator *fields); +bool check_grant_all_columns(THD *thd, ulong want_access, + Field_iterator_table_ref *fields); bool check_grant_routine(THD *thd, ulong want_access, TABLE_LIST *procs, bool is_proc, bool no_error); bool check_grant_db(THD *thd,const char *db); |