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 '10.6' into 10.7

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-11 11:25:33 +02:00
parent 7b05fc5cdd a917be3e7f
commit fd132be117
284 changed files with 7487 additions and 1880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_insert.cc
View File

@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2016, Oracle and/or its affiliates.
Copyright (c) 2010, 2021, MariaDB
Copyright (c) 2010, 2022, MariaDB Corporation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -995,7 +995,12 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list,
goto values_loop_end;
THD_STAGE_INFO(thd, stage_update);
thd->decide_logging_format_low(table);
if (duplic == DUP_UPDATE)
{
restore_record(table,s->default_values); // Get empty record
thd->reconsider_logging_format_for_iodup(table);
}
fix_rownum_pointers(thd, thd->lex->current_select, &info.accepted_rows);
if (returning)
fix_rownum_pointers(thd, thd->lex->returning(), &info.accepted_rows);