summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authortomas@poseidon.ndb.mysql.com <>2005-03-17 15:29:25 +0100
committertomas@poseidon.ndb.mysql.com <>2005-03-17 15:29:25 +0100
commit7cc49e6b95fe6e4fcffcc742ec319d7ac4d3c60a (patch)
tree52e670a542573ea7062de2b9d6afac0dc14918c2 /sql/sql_acl.h
parent1d1be36d8707accdf089d9c4cad827e7d8d041fe (diff)
parent08b2c7ecca7ba3fd3d55267bcf4ce900fa9ce595 (diff)
downloadmariadb-git-7cc49e6b95fe6e4fcffcc742ec319d7ac4d3c60a.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h2
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