summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-10-18 13:06:41 -0700
committerSergei Golubchik <sergii@pisem.net>2013-10-18 13:06:41 -0700
commitd2c683527fec45873011f69d460d60c78fe4f199 (patch)
treee41b92e4d4fbf4bcb727f5a0e9fef5d0487baa25 /sql/sql_acl.h
parent7fba8e5164038d6f18c93f2c34fb12ece0766c53 (diff)
downloadmariadb-git-d2c683527fec45873011f69d460d60c78fe4f199.tar.gz
recursive privilege propagation for roles.
functions for traversing the role graph in either direction. merging of global, database, table, column, routine privileges. debug status variables for counting number of privilege merges. tests.
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index 91add84a066..8766f78ecee 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -394,4 +394,9 @@ bool acl_check_proxy_grant_access (THD *thd, const char *host, const char *user,
bool with_grant);
int acl_setrole(THD *thd, char *rolename, ulonglong access);
int acl_check_setrole(THD *thd, char *rolename, ulonglong *access);
+
+#ifndef DBUG_OFF
+extern ulong role_global_merges, role_db_merges, role_table_merges,
+ role_column_merges, role_routine_merges;
+#endif
#endif /* SQL_ACL_INCLUDED */