diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-23 20:03:59 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-23 20:03:59 +0300 |
| commit | 35c2b9df7564c95c38f04fc4dbc3bebea81a9a41 (patch) | |
| tree | 31f9bf5794339dd4559001264cd2cc350877d76b /sql/sql_acl.h | |
| parent | 16d6c8eb1fc39dd9ae1e396f776b1be270e48d7e (diff) | |
| download | mariadb-git-35c2b9df7564c95c38f04fc4dbc3bebea81a9a41.tar.gz | |
SHOW GRANTS hided real grants when grants on both column and table (Bug 654)
mysql-test/r/grant.result:
Test of grant BUG
mysql-test/t/grant.test:
Test of grant BUG
sql/sql_acl.cc:
SHOW GRANTS hided real grants when grants on both column and table (Bug 654)
Code cleanup (Bigger than intended because of editor problem)
sql/sql_acl.h:
Fixed grant bug
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 f3fdf950a12..bf269e5a7e3 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) & 7) | (((A) & ~7) << 7)) -#define get_rights_for_column(A) (((A) & 7) | (((A) & ~7) >> 7)) +#define fix_rights_for_column(A) (((A) & 7) | (((A) & ~7) << 8)) +#define get_rights_for_column(A) (((A) & 7) | ((A) >> 8)) /* prototypes */ |