database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-01-07 09:08:09 +02:00
parent 8a4ca33938 a993310593
commit 92abdcca5a
178 changed files with 3017 additions and 1446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_delete.cc
View File

@ -281,7 +281,15 @@ int TABLE::delete_row()
store_record(this, record[1]);
vers_update_end();
return file->ha_update_row(record[1], record[0]);
int err= file->ha_update_row(record[1], record[0]);
/*
MDEV-23644: we get HA_ERR_FOREIGN_DUPLICATE_KEY iff we already got history
row with same trx_id which is the result of foreign key action, so we
don't need one more history row.
*/
if (err == HA_ERR_FOREIGN_DUPLICATE_KEY)
return file->ha_delete_row(record[0]);
return err;
}