diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-05-17 23:25:13 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-05-17 23:25:13 +0200 |
| commit | 2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5 (patch) | |
| tree | 2884a280bfd49ec5194214f1f3708dcc5b7cd2aa /sql/sql_acl.h | |
| parent | db4a3d9a703f89e0fbd2a8a8a426e6bc8f4b6571 (diff) | |
| parent | cdba1d562d40ca20c70377a8ed40d2dfb72b6058 (diff) | |
| download | mariadb-git-2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 2bc7c45907c..87280c4e9ba 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -186,9 +186,9 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &user_list, bool mysql_table_grant(THD *thd, TABLE_LIST *table, List <LEX_USER> &user_list, List <LEX_COLUMN> &column_list, ulong rights, bool revoke); -bool mysql_procedure_grant(THD *thd, TABLE_LIST *table, - List <LEX_USER> &user_list, ulong rights, - bool revoke, bool no_error); +bool mysql_routine_grant(THD *thd, TABLE_LIST *table, bool is_proc, + List <LEX_USER> &user_list, ulong rights, + bool revoke, bool no_error); ACL_USER *check_acl_user(LEX_USER *user_name, uint *acl_acl_userdx); my_bool grant_init(THD *thd); void grant_free(void); @@ -201,8 +201,8 @@ bool check_grant_column (THD *thd, GRANT_INFO *grant, 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_procedure(THD *thd, ulong want_access, - TABLE_LIST *procs, bool no_error); +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); ulong get_table_grant(THD *thd, TABLE_LIST *table); ulong get_column_grant(THD *thd, GRANT_INFO *grant, @@ -217,9 +217,12 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list); bool mysql_revoke_all(THD *thd, List <LEX_USER> &list); void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant, const char *db, const char *table); -bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name); -bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name); -bool check_routine_level_acl(THD *thd, const char *db, const char *name); +bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name, + bool is_proc); +bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name, + bool is_proc); +bool check_routine_level_acl(THD *thd, const char *db, const char *name, + bool is_proc); #ifdef NO_EMBEDDED_ACCESS_CHECKS #define check_grant(A,B,C,D,E,F) 0 |