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.3' into 10.4

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-08 15:02:19 +02:00
parent 40b8f3ec1a 79660e59ee
commit a70a1cf3f4
197 changed files with 5210 additions and 1291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_base.cc
View File

@ -907,7 +907,14 @@ void close_thread_tables(THD *thd)
table->s->table_name.str, (ulong) table->query_id));
if (thd->locked_tables_mode)
{
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (table->part_info && table->part_info->vers_require_hist_part(thd) &&
!thd->stmt_arena->is_stmt_prepare())
table->part_info->vers_check_limit(thd);
#endif
table->vcol_cleanup_expr(thd);
}
/* Detach MERGE children after every statement. Even under LOCK TABLES. */
if (thd->locked_tables_mode <= LTM_LOCK_TABLES ||