diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-08-03 17:21:21 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-08-03 17:21:21 +0300 |
| commit | 990b178c322fb24faa71ae4c09fc92945b439109 (patch) | |
| tree | 18f306e3764d9e1ef7f787bcd794f1217ba9b9eb | |
| parent | 0ebb78e8ef8fa1fc77ac8c9caeb8cbd37337030a (diff) | |
| download | mariadb-git-990b178c322fb24faa71ae4c09fc92945b439109.tar.gz | |
Fixed a problem with privilege tables when downgrading from 4.0.2
to 3.23
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 11140681ceb..01a0095646c 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -46928,6 +46928,8 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.52 @itemize @bullet @item +Fixed problem with privilege tables when downgrading from 4.0.2 to 3.23 ... +@item Added name of 'administrator command' logs. @item Fixed bug with creating an auto-increment value on second part of a diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index edfc2ceeab8..f0131023157 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -215,7 +215,7 @@ int acl_init(bool dont_read_acl_tables) continue; /* purecov: tested */ } get_salt_from_password(user.salt,user.password); - user.access=get_access(table,3); + user.access=get_access(table,3) & GLOBAL_ACLS; user.sort=get_sort(2,user.host.hostname,user.user); user.hostname_length=user.host.hostname ? (uint) strlen(user.host.hostname) : 0; #ifndef TO_BE_REMOVED |