diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-18 02:01:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-18 02:01:34 +0300 |
| commit | 2534521f9a7d66b48cb9ca9402e82a0c58b156d8 (patch) | |
| tree | 920207a20892d748bd6b04a6699f07a5f3f1fae5 /sql/sql_acl.h | |
| parent | 0b7f8ed9738546f57d9159b52894e5abc99086fc (diff) | |
| download | mariadb-git-2534521f9a7d66b48cb9ca9402e82a0c58b156d8.tar.gz | |
Fixed some merge issues:
- temporary tables now works
- mysql-system_tables updated to not use temporary tables
- PASSWORD() function fixed
- Support for STATS_AUTO_RECALC, STATS_PERSISTENT and STATS_SAMPLE_PAGES table options
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 3169746419c..d519279e9c2 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -95,6 +95,14 @@ CREATE_ACL | DROP_ACL | ALTER_ACL | INDEX_ACL | \ TRIGGER_ACL | REFERENCES_ACL | GRANT_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL) +/** + Table-level privileges which are automatically "granted" to everyone on + existing temporary tables (CREATE_ACL is necessary for ALTER ... RENAME). +*/ +#define TMP_TABLE_ACLS \ +(SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \ + INDEX_ACL | ALTER_ACL) + /* Defines to change the above bits to how things are stored in tables This is needed as the 'host' and 'db' table is missing a few privileges @@ -245,7 +253,7 @@ int fill_schema_schema_privileges(THD *thd, TABLE_LIST *tables, COND *cond); int fill_schema_table_privileges(THD *thd, TABLE_LIST *tables, COND *cond); int fill_schema_column_privileges(THD *thd, TABLE_LIST *tables, COND *cond); int wild_case_compare(CHARSET_INFO *cs, const char *str,const char *wildstr); - +int check_password_policy(String *password); #ifdef NO_EMBEDDED_ACCESS_CHECKS #define check_grant(A,B,C,D,E,F) 0 #define check_grant_db(A,B) 0 |