summaryrefslogtreecommitdiffstats
path: root/sql/sql_reload.cc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-07-01 18:15:00 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-07-01 18:15:00 +0000
commita2a2e32c02643a0cec111511220227703fda1cd5 (patch)
tree69cc2b631234c2a8e026b9cd4d72676c61c594df /sql/sql_reload.cc
parentReleasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff)
downloadmariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz
mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/sql_reload.cc')
-rw-r--r--sql/sql_reload.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index f6f5cf20..0c0b863e 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -92,6 +92,8 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
{
thd->thread_stack= (char*) &tmp_thd;
thd->store_globals();
+ thd->set_query_inner((char*) STRING_WITH_LEN("intern:reload_acl"),
+ default_charset_info);
}
if (likely(thd))