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.10' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-08 14:57:31 +02:00
parent 1ba5a0205c d2fdba94cf
commit 036df5f970
871 changed files with 12640 additions and 6371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_insert.cc
View File

@ -2037,7 +2037,8 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, select_result *sink)
if (error != HA_ERR_RECORD_IS_THE_SAME)
{
info->updated++;
if (table->versioned())
if (table->versioned() &&
table->vers_check_update(*info->update_fields))
{
if (table->versioned(VERS_TIMESTAMP))
{
@ -4604,8 +4605,6 @@ TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items,
*/
if (!mysql_create_table_no_lock(thd, &ddl_log_state_create, &ddl_log_state_rm,
&table_list->db,
&table_list->table_name,
create_info, alter_info, NULL,
select_field_count, table_list))
{