From 990b178c322fb24faa71ae4c09fc92945b439109 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 3 Aug 2002 17:21:21 +0300 Subject: [PATCH] Fixed a problem with privilege tables when downgrading from 4.0.2 to 3.23 --- Docs/manual.texi | 2 ++ sql/sql_acl.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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