diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 11:22:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 11:22:51 +0300 |
| commit | c6b8b05be48d7cc7a3a46063bf4dee269d7d5609 (patch) | |
| tree | 75983aff9e643020e1325cf94c8a1d4fa6281871 /sql | |
| parent | 977d7a7572ce97b1f21bfef8531a5c574f518ba2 (diff) | |
| parent | 03672a0573566cdb31a5ad3a925f80d2560ebc9b (diff) | |
| download | mariadb-git-c6b8b05be48d7cc7a3a46063bf4dee269d7d5609.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql')
| -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 0b1749fd10d..4ffb2c8b8f1 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -5879,7 +5879,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; |