database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-21 09:01:01 +03:00
parent 675c22c065 a0588d54a2
commit 80ed136e6d
163 changed files with 8191 additions and 3352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_reload.cc
View File

@ -417,6 +417,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)
{