mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-25 09:45:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.5' into 10.6

Browse source
This commit is contained in:
Oleksandr Byelkin 2024-10-29 14:20:03 +01:00
commit f00711bba2
128 changed files with 1855 additions and 841 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))
{