mariadb/storage
Marko Mäkelä 609ea2f37b MDEV-17614: After-merge fix
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.
2019-08-12 18:50:54 +03:00
..
archive Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
blackhole MDEV-11094: Blackhole table updates on slave fail when row annotation is enabled 2019-05-29 17:35:29 +05:30
cassandra Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
connect Fixed issues found by valgrind 2019-08-12 15:41:14 +03:00
csv Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
example Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
federated Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
federatedx Merge 10.1 into 10.2 2019-04-03 19:58:47 +03:00
heap imporve clang build 2019-06-25 13:21:36 +03:00
innobase MDEV-17614: After-merge fix 2019-08-12 18:50:54 +03:00
maria Fixed some errors & warnings found by clang 2019-08-08 23:08:23 +03:00
mroonga Fixed some errors & warnings found by clang 2019-08-08 23:08:23 +03:00
myisam imporve clang build 2019-06-25 13:21:36 +03:00
myisammrg imporve clang build 2019-06-25 13:21:36 +03:00
oqgraph Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
perfschema imporve clang build 2019-06-25 13:21:36 +03:00
rocksdb MDEV-16955: rocksdb_sys_vars.rocksdb_update_cf_options_basic 2019-08-10 01:46:50 +03:00
sequence Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
sphinx MDEV-16544 - crash in ha_sphinx::create() 2018-08-04 22:53:16 +01:00
spider Merge 10.1 into 10.2 2019-07-09 13:22:22 +03:00
test_sql_discovery Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
tokudb Merge branch '10.1' into 10.2 2019-07-26 13:39:17 +02:00
xtradb Merge 10.1 into 10.2 2019-08-12 18:25:35 +03:00