database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '11.1' into 11.2

Browse Source
This commit is contained in:
Sergei Golubchik
2023-08-17 17:27:05 +02:00
parent 8aa1a9e6a7 9bc25d9820
commit 18ddde4826
879 changed files with 12425 additions and 6297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_base.cc
View File

@ -846,7 +846,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. */
@ -1781,6 +1786,8 @@ bool TABLE::vers_switch_partition(THD *thd, TABLE_LIST *table_list,
}
break;
}
DBUG_ASSERT(!thd->lex->last_table() ||
!thd->lex->last_table()->vers_conditions.delete_history);
}
if (table_list->partition_names)