diff options
| author | unknown <serg@sergbook.mylan> | 2003-06-23 12:49:38 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mylan> | 2003-06-23 12:49:38 +0200 |
| commit | 209d8a4e57bbd20edb6077c2c2448705de5d8168 (patch) | |
| tree | 6d1c59f13f9ef4cdc3ea7bec79bc4287614efbe7 /sql | |
| parent | ba49cc62b0b4a60868765e2192f9b3571ab96b65 (diff) | |
| parent | 09c7b48d43b13d7e292b79b8abd2ed2a1490715f (diff) | |
| download | mariadb-git-209d8a4e57bbd20edb6077c2c2448705de5d8168.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_acl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 1d074fe6001..f3fdf950a12 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -76,8 +76,8 @@ #define get_rights_for_db(A) (((A) & 63) | (((A) & DB_CHUNK1) >> 4) | (((A) & DB_CHUNK2) >> 6)) #define fix_rights_for_table(A) (((A) & 63) | (((A) & ~63) << 4)) #define get_rights_for_table(A) (((A) & 63) | (((A) & ~63) >> 4)) -#define fix_rights_for_column(A) (((A) & COL_ACLS) | ((A & ~COL_ACLS) << 7)) -#define get_rights_for_column(A) (((A) & COL_ACLS) | ((A & ~COL_ACLS) >> 7)) +#define fix_rights_for_column(A) (((A) & 7) | (((A) & ~7) << 7)) +#define get_rights_for_column(A) (((A) & 7) | (((A) & ~7) >> 7)) /* prototypes */ |