diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:29:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:32:21 +0300 |
| commit | dbc716675b183dc972a40dd1320f4bdae04c1f29 (patch) | |
| tree | 65550afccea8fc9e0d47ba16a679eef44c7dab1a /sql/sql_acl.cc | |
| parent | e3f44d8d0eb0277312391686672f81a460094917 (diff) | |
| parent | c0fca2863bcbd7cd231f1aa747b4f8d999e3a00e (diff) | |
| download | mariadb-git-dbc716675b183dc972a40dd1320f4bdae04c1f29.tar.gz | |
Merge 10.1 into 10.2
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 ae6030115fa..871744c6b36 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -5947,7 +5947,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; |