diff options
| author | unknown <timour@mysql.com> | 2005-12-07 10:47:43 +0200 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-12-07 10:47:43 +0200 |
| commit | f1ac6bb9758369653c37099d7f36fe0a47ad2d35 (patch) | |
| tree | 5c45e53e7f09589e61835d39a983102878f0071e /sql/sql_acl.h | |
| parent | fd2beeda33771172dbb95518df3233cb7e005187 (diff) | |
| parent | f095abaa4748c5ad2c302b8697c819d3fbd5de2a (diff) | |
| download | mariadb-git-f1ac6bb9758369653c37099d7f36fe0a47ad2d35.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-2486
into mysql.com:/home/timka/mysql/src/5.1-dbg
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/sql_base.cc:
SCCS merged
sql/table.cc:
SCCS 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 0a9c6ba785f..88704f5ff88 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -205,7 +205,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); |