diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-03 08:12:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-03 08:12:47 +0200 |
| commit | a13fac9eeef0f304b6b6f52ad2b6659f22190523 (patch) | |
| tree | 7bbcbe8765354f03142a005198276cadbfac6b20 /sql/sql_acl.cc | |
| parent | e28d9c15c3093612d841b24b5bb6b480c9b8009c (diff) | |
| parent | f146969fb3a1e8ed508f55ee38faaffd5cff2021 (diff) | |
| download | mariadb-git-a13fac9eeef0f304b6b6f52ad2b6659f22190523.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index bad39cfc1d1..25e8aa42c7c 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -9463,6 +9463,8 @@ static bool show_global_privileges(THD *thd, ACL_USER_BASE *acl_entry, add_user_parameters(thd, &global, (ACL_USER *)acl_entry, (want_access & GRANT_ACL)); + else if (want_access & GRANT_ACL) + global.append(STRING_WITH_LEN(" WITH GRANT OPTION")); protocol->prepare_for_resend(); protocol->store(global.ptr(),global.length(),global.charset()); if (protocol->write()) |