1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge branch '11.6' into 11.7

This commit is contained in:
Oleksandr Byelkin
2024-11-09 19:01:12 +01:00
789 changed files with 10342 additions and 4415 deletions

View File

@@ -90,7 +90,6 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
*/
if (unlikely(!thd) && (thd= (tmp_thd= new THD(0))))
{
thd->thread_stack= (char*) &tmp_thd;
thd->store_globals();
thd->set_query_inner((char*) STRING_WITH_LEN("intern:reload_acl"),
default_charset_info);