From bc609a84113921ac1fdae9a31e60d5974ebd4e7b Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 6 Oct 2025 23:35:47 +0200
Subject: [PATCH] FLUSH PRIVILEGES should flush servers also in embedded

servers aren't really privileges, so even if they're affected
by FLUSH PRIVILEGES, they aren't disabled in embedded.
---
 sql/sql_reload.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index 44bac906540..12f12b14c95 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -80,9 +80,9 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
 
   DBUG_ASSERT(!thd || !thd->in_sub_stmt);
 
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (options & REFRESH_GRANT)
   {
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
     THD *tmp_thd= 0;
     /*
       If reload_acl_and_cache() is called from SIGHUP handler we have to
@@ -124,8 +124,11 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
       thd= 0;
     }
     reset_mqh((LEX_USER *)NULL, TRUE);
-  }
+#else
+    if ((result= thd && servers_reload(thd)))
+      my_error(ER_UNKNOWN_ERROR, MYF(0));
 #endif
+  }
   if (options & REFRESH_LOG)
   {
     /*