diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 11:42:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 11:43:39 +0300 |
| commit | c8f8d5ceb7227ff825f86ea2d61dd1edd9e610b2 (patch) | |
| tree | ca46d8cbae14a7bd788d87c200e2941637e92728 /sql/sql_acl.cc | |
| parent | 5f31f8cc87c6fc108f6089a18895466b936dfe72 (diff) | |
| parent | c6b8b05be48d7cc7a3a46063bf4dee269d7d5609 (diff) | |
| download | mariadb-git-c8f8d5ceb7227ff825f86ea2d61dd1edd9e610b2.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index adfd444e4c2..97a08f72191 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -6255,7 +6255,7 @@ static bool merge_role_db_privileges(ACL_ROLE *grantee, const char *dbname, ulong access= 0, update_flags= 0; for (int *p= dbs.front(); p <= dbs.back(); p++) { - if (first<0 || (!dbname && strcmp(acl_dbs.at(*p).db, acl_dbs.at(*p-1).db))) + if (first<0 || (!dbname && strcmp(acl_dbs.at(p[0]).db, acl_dbs.at(p[-1]).db))) { // new db name series update_flags|= update_role_db(merged, first, access, grantee->user.str); merged= -1; |