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

Merge branch '10.6' into 10.9

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-04 08:01:06 +02:00
parent a89527e127 5ea5291d97
commit 34a8e78581
858 changed files with 12277 additions and 6177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_base.cc
View File

@ -844,7 +844,12 @@ int close_thread_tables(THD *thd)
!thd->stmt_arena->is_stmt_prepare())
table->part_info->vers_check_limit(thd);
#endif
table->vcol_cleanup_expr(thd);
/*
For simple locking we cleanup it here because we don't close thread
tables. For prelocking we close it when we do close thread tables.
*/
if (thd->locked_tables_mode != LTM_PRELOCKED)
table->vcol_cleanup_expr(thd);
}
/* Detach MERGE children after every statement. Even under LOCK TABLES. */