diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-08 10:40:52 +0100 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-08 10:40:52 +0100 |
commit | 836cc05fa6b30aea881321eb3aa80e41aec711ba (patch) | |
tree | f8ac1eacd7b5ff23ee1f18190f0f3c727ecd01e5 /sql/sql_acl.h | |
parent | 05dfca24c4720bcc334d27a2e88ddfe9dccf14a6 (diff) | |
parent | ceaacb741ab607ec42c2d5e863f2f7c527825aae (diff) | |
download | mariadb-git-836cc05fa6b30aea881321eb3aa80e41aec711ba.tar.gz |
Merge
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
configure.in:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
SCCS merged
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 30e335c7afd..be45b9d25cd 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 | \ |