diff options
| author | unknown <brian@zim.(none)> | 2005-01-06 14:09:13 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-01-06 14:09:13 -0800 |
| commit | 76cc62153b9c7a5d59a7ff66b8036a07977e8a8a (patch) | |
| tree | 52540f6e1c0c472e459b1d6e711c1fe3f1b514ff /sql/sql_acl.h | |
| parent | ae7cfe9ee8507d2d145c806cc07b39a712426331 (diff) | |
| parent | 0c0d8b216a1dbe444ae2847fa045937684948956 (diff) | |
| download | mariadb-git-76cc62153b9c7a5d59a7ff66b8036a07977e8a8a.tar.gz | |
Merge for 5.0 to 5.1
BitKeeper/triggers/post-commit:
Merge for 5.0 -> 5.1
configure.in:
Merge for 5.0 -> 5.1
mysql-test/r/grant.result:
Merge for 5.0 -> 5.1
scripts/mysql_create_system_tables.sh:
Merge for 5.0 -> 5.1
scripts/mysql_fix_privilege_tables.sql:
Merge for 5.0 -> 5.1
sql/sql_acl.cc:
Merge 5.0 -> 5.1
sql/sql_acl.h:
Merge 5.0 -> 5.1
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index b129ffcdcf8..57f8009dc3e 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -45,7 +45,6 @@ in sql_show.cc when adding new privileges! */ - #define DB_ACLS \ (UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \ GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \ |