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

Merge 11.0-selectivity into 11.0

Browse Source
This commit is contained in:
Sergei Petrunia
2023-02-15 12:03:12 +03:00
parent f74bb51b30 e8c7222ba3
commit 10a974adc9
739 changed files with 33079 additions and 13101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_acl.cc
View File

@ -2518,6 +2518,8 @@ bool acl_init(bool dont_read_acl_tables)
DBUG_RETURN(1); /* purecov: inspected */
thd->thread_stack= (char*) &thd;
thd->store_globals();
thd->set_query_inner((char*) STRING_WITH_LEN("intern:acl_init"),
default_charset_info);
/*
It is safe to call acl_reload() since acl_* arrays and hashes which
will be freed there are global static objects and thus are initialized
@ -7986,6 +7988,9 @@ bool grant_init()
DBUG_RETURN(1); /* purecov: deadcode */
thd->thread_stack= (char*) &thd;
thd->store_globals();
thd->set_query_inner((char*) STRING_WITH_LEN("intern:grant_init"),
default_charset_info);
return_val= grant_reload(thd);
delete thd;
DBUG_RETURN(return_val);