database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2024-01-31 17:32:53 +01:00
parent 97fcafb9ec 46e3a7658b
commit 01f6abd1d4
59 changed files with 980 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_admin.cc
View File

@ -786,7 +786,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
if (lock_type == TL_WRITE && table->mdl_request.type > MDL_SHARED_WRITE)
{
if (table->table->s->tmp_table)
thd->close_unused_temporary_table_instances(tables);
thd->close_unused_temporary_table_instances(table);
else
{
if (wait_while_table_is_used(thd, table->table, HA_EXTRA_NOT_USED))