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.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-29 15:24:38 +01:00
parent db3be9b434 f00711bba2
commit 3d0fb15028
655 changed files with 8060 additions and 3541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_reload.cc
View File

@@ -89,10 +89,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
allocate temporary THD for execution of acl_reload()/grant_reload().
*/
if (unlikely(!thd) && (thd= (tmp_thd= new THD(0))))
{
thd->thread_stack= (char*) &tmp_thd;
thd->store_globals();
}
if (likely(thd))
{