diff options
| author | unknown <andrey@lmy004.> | 2005-12-14 12:15:48 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2005-12-14 12:15:48 +0100 |
| commit | b67555d5d4ff74a4abefdc08f25177d7aa28b5aa (patch) | |
| tree | 663635d76e1d9032ac61b9dba1c539cda396d327 /sql/sql_acl.h | |
| parent | 44523ebc50d913c4b0a33e1e9214e60357081ae3 (diff) | |
| parent | d22bb45cce40cb015982c193664df08afecb14c7 (diff) | |
| download | mariadb-git-b67555d5d4ff74a4abefdc08f25177d7aa28b5aa.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034
into lmy004.:/work/mysql-5.1-tt-copy-works
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 0a9c6ba785f..44e42b961a2 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -42,6 +42,7 @@ #define CREATE_PROC_ACL (1L << 23) #define ALTER_PROC_ACL (1L << 24) #define CREATE_USER_ACL (1L << 25) +#define EVENT_ACL (1L << 26) /* don't forget to update 1. static struct show_privileges_st sys_privileges[] @@ -56,7 +57,7 @@ (UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \ GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \ LOCK_TABLES_ACL | EXECUTE_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL | \ - CREATE_PROC_ACL | ALTER_PROC_ACL) + CREATE_PROC_ACL | ALTER_PROC_ACL | EVENT_ACL) #define TABLE_ACLS \ (SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \ @@ -78,7 +79,7 @@ REFERENCES_ACL | INDEX_ACL | ALTER_ACL | SHOW_DB_ACL | SUPER_ACL | \ CREATE_TMP_ACL | LOCK_TABLES_ACL | REPL_SLAVE_ACL | REPL_CLIENT_ACL | \ EXECUTE_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL | CREATE_PROC_ACL | \ - ALTER_PROC_ACL | CREATE_USER_ACL) + ALTER_PROC_ACL | CREATE_USER_ACL | EVENT_ACL) #define DEFAULT_CREATE_PROC_ACLS \ (ALTER_PROC_ACL | EXECUTE_ACL) |