summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-12-07 14:59:06 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2023-01-03 10:17:42 +0100
commit22491e627aad3ff9c9c8b076c0a1f9cb9f2ae4aa (patch)
tree54047a7f8d00d171ae0a76f0facc154c829be777 /sql/sql_acl.cc
parenta5be6c91cbf3c2f9104703c0ee13e386ecb3224a (diff)
downloadmariadb-git-22491e627aad3ff9c9c8b076c0a1f9cb9f2ae4aa.tar.gz
MDEV-30154: Assertion `strcasecmp(rolename, public_name.str) || acl_public == role' failed in acl_update_role on GRANT ... TO PUBLIC
Reset of acl_public was made too early (before saving it to restore in case of error).
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 e91770c8686..8cf9c7b6df2 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2918,7 +2918,6 @@ bool acl_reload(THD *thd)
int result;
DBUG_ENTER("acl_reload");
- acl_public= NULL;
Grant_tables tables;
/*
@@ -2963,6 +2962,7 @@ bool acl_reload(THD *thd)
old_mem= acl_memroot;
delete_dynamic(&acl_wild_hosts);
my_hash_free(&acl_check_hosts);
+ acl_public= NULL;
if ((result= acl_load(thd, tables)))
{ // Error. Revert to old list