database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.11' into 11.0

Browse Source
This commit is contained in:
Sergei Golubchik
2024-05-11 13:23:27 +02:00
parent fc670b46bd 3a06964468
commit f9807aadef
820 changed files with 18746 additions and 6295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/sql_reload.cc
View File

@@ -68,6 +68,15 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
bool result=0;
select_errors=0; /* Write if more errors */
int tmp_write_to_binlog= *write_to_binlog= 1;
#ifndef DBUG_OFF
/*
When invoked for handling a SIGHUP by rpl_shutdown_sighup.test, we need to
force the signal handler to wait after REFRESH_TABLES, as that will check
for a killed server, and we need to call hostname_cache_refresh after
server cleanup has happened to trigger MDEV-30260.
*/
int do_dbug_sleep= 0;
#endif
DBUG_ASSERT(!thd || !thd->in_sub_stmt);
@@ -102,6 +111,15 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
*/
my_error(ER_UNKNOWN_ERROR, MYF(0));
}
#ifndef DBUG_OFF
DBUG_EXECUTE_IF("hold_sighup_log_refresh", {
DBUG_ASSERT(!debug_sync_set_action(
thd, STRING_WITH_LEN("now SIGNAL in_reload_acl_and_cache "
"WAIT_FOR refresh_logs")));
do_dbug_sleep= 1;
});
#endif
}
opt_noacl= 0;
@@ -354,6 +372,11 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
}
my_dbopt_cleanup();
}
#ifndef DBUG_OFF
if (do_dbug_sleep)
my_sleep(3000000); // 3s
#endif
if (options & REFRESH_HOSTS)
hostname_cache_refresh();
if (thd && (options & REFRESH_STATUS))
@@ -372,7 +395,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
}
}
#endif
#ifdef HAVE_OPENSSL
#ifdef HAVE_des
if (options & REFRESH_DES_KEY_FILE)
{
if (des_key_file && load_des_key_file(des_key_file))