summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-08-03 17:21:21 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-08-03 17:21:21 +0300
commit990b178c322fb24faa71ae4c09fc92945b439109 (patch)
tree18f306e3764d9e1ef7f787bcd794f1217ba9b9eb /sql/sql_acl.cc
parent0ebb78e8ef8fa1fc77ac8c9caeb8cbd37337030a (diff)
downloadmariadb-git-990b178c322fb24faa71ae4c09fc92945b439109.tar.gz
Fixed a problem with privilege tables when downgrading from 4.0.2
to 3.23
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 1 insertions, 1 deletions
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