diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-23 16:00:39 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-23 16:00:39 +0300 |
| commit | 3871ff6ae7db81ccdbec64fab893297e5804e822 (patch) | |
| tree | ff93abb19c37c896bdaa642b77b358caf31fdf46 | |
| parent | e6dfbacab172659a229a97a284f0217802782137 (diff) | |
| parent | 95f210cddcfedb3cef95cb1bfe833ee64ed83eaa (diff) | |
| download | mariadb-git-3871ff6ae7db81ccdbec64fab893297e5804e822.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/sql_acl.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 9a826cffbfc..89f03d96369 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -85,6 +85,7 @@ sasha@mysql.sashanet.com serg@build.mysql2.com serg@serg.mylan serg@serg.mysql.com +serg@sergbook.mylan serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi tfr@beta.frontier86.ee 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 */ |