diff options
| author | unknown <timour@mysql.com> | 2005-12-06 18:04:26 +0200 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-12-06 18:04:26 +0200 |
| commit | 1a7a8067fee53d8f183bd2ee8ac955c73186b7be (patch) | |
| tree | b7f446c2b01791b8e340597e85c4cd62eaf92794 /sql/sql_acl.h | |
| parent | 29eac312cda3bebddeb7f5ab7a2af6b81ea89205 (diff) | |
| parent | e486fe1ff18796792fac56ca5425733fb0f68692 (diff) | |
| download | mariadb-git-1a7a8067fee53d8f183bd2ee8ac955c73186b7be.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-2486
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:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 0e50737f84c..c8fadb73b0c 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -204,7 +204,9 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, uint show_command, uint number, bool dont_print_error); bool check_grant_column (THD *thd, GRANT_INFO *grant, const char *db_name, const char *table_name, - const char *name, uint length, uint show_command=0); + 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); |