mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-17614: After-merge fix

Browse source 
MDEV-17614 flags INSERT…ON DUPLICATE KEY UPDATE unsafe for statement-based
replication when there are multiple unique indexes. This correctly fixes
something whose attempted fix in MySQL 5.7
in mysql/mysql-server@c93b0d9a97
caused lock conflicts. That change was reverted in MySQL 5.7.26
in mysql/mysql-server@066b6fdd43
(with a substantial amount of other changes).

In MDEV-17073 we already disabled the unfortunate MySQL change when
statement-based replication was not being used. Now, thanks to MDEV-17614,
we can actually remove the change altogether.

This reverts commit 8a346f31b9 (MDEV-17073)
and mysql/mysql-server@c93b0d9a97 while
keeping the test cases.
This commit is contained in:
Marko Mäkelä 2019-08-12 18:50:54 +03:00
commit 609ea2f37b
11 changed files with 55 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/innobase/include/row0ins.h
View file

@ -196,10 +196,6 @@ struct ins_node_t{
entry_list and sys fields are stored here;
if this is NULL, entry list should be created
and buffers for sys fields in row allocated */
dict_index_t* duplicate;
/* This is the first index that reported
DB_DUPLICATE_KEY. Used in the case of REPLACE
or INSERT ... ON DUPLICATE UPDATE. */
ulint magic_n;
};