summaryrefslogtreecommitdiff
path: root/sql/sql_reload.cc
diff options
context:
space:
mode:
authormkaruza <mario.karuza@galeracluster.com>2021-02-05 11:06:25 +0100
committerJan Lindström <jan.lindstrom@mariadb.com>2021-04-15 08:50:01 +0300
commitc3b016efde4b1e0c2b85ca26c814ad43f5611ab2 (patch)
treea253e3593bc130bc37931540ef56b504ed23796d /sql/sql_reload.cc
parent767d63374e634f8ede5e18a8a74127a113013467 (diff)
downloadmariadb-git-c3b016efde4b1e0c2b85ca26c814ad43f5611ab2.tar.gz
MDEV-22668: "Flush SSL" command doesn't reload wsrep certbb-10.4-MDEV-22668
Trigger `socket.ssl_reload` when FLUSH SSL is issued. To triger reloading of certificate, key and CA, files needs to be physically changed. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
Diffstat (limited to 'sql/sql_reload.cc')
-rw-r--r--sql/sql_reload.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index 5b4600ece9a..76fb9819fd5 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -416,6 +416,14 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
{
if (reinit_ssl())
result= 1;
+#ifdef WITH_WSREP
+ if (!result &&
+ WSREP_ON && wsrep_reload_ssl())
+ {
+ my_message(ER_UNKNOWN_ERROR, "Failed to refresh WSREP SSL.", MYF(0));
+ result= 1;
+ }
+#endif
}
if (options & REFRESH_GENERIC)
{