summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authorpem@mysql.com <>2004-04-07 19:07:44 +0200
committerpem@mysql.com <>2004-04-07 19:07:44 +0200
commitdfd59e296e2c267a21f1ea8b3b937e07730dad0d (patch)
treee5ac1517ff3dccc42352b7bac39ecd1c093d0ae6 /sql/sql_acl.h
parent1541f2e7949416d6e172ef6406ecf140d3b26659 (diff)
parent61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff)
downloadmariadb-git-dfd59e296e2c267a21f1ea8b3b937e07730dad0d.tar.gz
Merge 4.1 -> 5.0.
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index f17c9781e8c..d2dd5b23f0d 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -36,6 +36,12 @@
#define REPL_SLAVE_ACL (1L << 19)
#define REPL_CLIENT_ACL (1L << 20)
+/*
+ don't forget to update
+ static struct show_privileges_st sys_privileges[]
+ in sql_show.cc when adding new privileges!
+*/
+
#define DB_ACLS \
(UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \