diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-17 15:29:25 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-17 15:29:25 +0100 |
| commit | d9f92569c695a1dc0521fb285c7ef3697390ae21 (patch) | |
| tree | 52e670a542573ea7062de2b9d6afac0dc14918c2 /sql/sql_acl.h | |
| parent | a6fe5b39adfc95f44627185854a2fdf68444026b (diff) | |
| parent | 621abfacfe316df9ce06c9d046ec11f23e543ea7 (diff) | |
| download | mariadb-git-d9f92569c695a1dc0521fb285c7ef3697390ae21.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index be45b9d25cd..c346837ea9e 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -218,7 +218,7 @@ 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, char *db, char *name); +bool check_routine_level_acl(THD *thd, const char *db, const char *name); #ifdef NO_EMBEDDED_ACCESS_CHECKS #define check_grant(A,B,C,D,E,F) 0 |