database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge 11.8 into 12.3

Browse Source
This commit is contained in:
Marko Mäkelä
2026-04-02 09:15:17 +03:00
parent 669e7aa798 1a144f713a
commit 55b3dced05
133 changed files with 2799 additions and 1472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_admin.cc
View File

@@ -1583,6 +1583,15 @@ bool mysql_assign_to_keycache(THD* thd, TABLE_LIST* tables,
KEY_CACHE *key_cache;
DBUG_ENTER("mysql_assign_to_keycache");
if (check_some_access(thd, TABLE_ACLS, tables))
{
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), "CACHE INDEX",
thd->security_ctx->priv_user,
thd->security_ctx->host_or_ip,
tables->db.str, tables->table_name.str);
DBUG_RETURN(TRUE);
}
THD_STAGE_INFO(thd, stage_finding_key_cache);
check_opt.init();
mysql_mutex_lock(&LOCK_global_system_variables);
@@ -1622,6 +1631,16 @@ bool mysql_assign_to_keycache(THD* thd, TABLE_LIST* tables,
bool mysql_preload_keys(THD* thd, TABLE_LIST* tables)
{
DBUG_ENTER("mysql_preload_keys");
if (check_some_access(thd, TABLE_ACLS, tables))
{
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), "LOAD INDEX INTO CACHE",
thd->security_ctx->priv_user,
thd->security_ctx->host_or_ip,
tables->db.str, tables->table_name.str);
DBUG_RETURN(TRUE);
}
/*
We cannot allow concurrent inserts. The storage engine reads
directly from the index file, bypassing the cache. It could read