diff options
| author | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
| commit | 2263e3e51faba531a0a7055dbf706a6a8719ad70 (patch) | |
| tree | 3c0ddcb446b8be099c3ab2616c459a573ee3cf92 /sql/sql_acl.h | |
| parent | 1279f9b024614cf97cf447cfb10d6d7d69abb8bc (diff) | |
| parent | 6e7a509d06824447e427dd44d5692489267d9c4b (diff) | |
| download | mariadb-git-2263e3e51faba531a0a7055dbf706a6a8719ad70.tar.gz | |
Merge with 4.0.14
Diffstat (limited to 'sql/sql_acl.h')
| -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 ca976f43999..0dc8c058b3d 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) << 8)) +#define get_rights_for_column(A) (((A) & 7) | ((A) >> 8)) /* Classes */ |