diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-08 15:02:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-08 23:03:08 +0200 |
| commit | a70a1cf3f4ed10c9d9194b2b8df6b6f08551a937 (patch) | |
| tree | 517124ec5059f48bff1e02b934355e8162183efc /sql/sql_base.cc | |
| parent | 40b8f3ec1a76fc23eb6bf9c5a8fef1debcbf5843 (diff) | |
| parent | 79660e59ee8fcd23f928c72dc77682b875bd58ce (diff) | |
| download | mariadb-git-a70a1cf3f4ed10c9d9194b2b8df6b6f08551a937.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index ef7a075e304..42285e9b3a4 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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 || |