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
..
btr
buf
data
dict
eval
fil
fsp
fts
fut
gis
ha
handler	Merge 10.1 into 10.2	2019-08-12 18:25:35 +03:00
ibuf
include	MDEV-17614: After-merge fix	2019-08-12 18:50:54 +03:00
lock
log	MDEV-20060: Failing assertion: srv_log_file_size <= 512ULL << 30 while preparing backup	2019-08-07 17:26:44 +03:00
mach
mem
mtr
mysql-test/storage_engine
os
page
pars
que	MDEV-17614: After-merge fix	2019-08-12 18:50:54 +03:00
read
rem
row	MDEV-17614: After-merge fix	2019-08-12 18:50:54 +03:00
srv	MDEV-20060: Failing assertion: srv_log_file_size <= 512ULL << 30 while preparing backup	2019-08-07 17:26:44 +03:00
sync
trx
ut
bzip2.cmake
CMakeLists.txt
compile-innodb
COPYING.Google
COPYING.Percona
innodb.cmake
lz4.cmake
lzma.cmake
lzo.cmake
plugin_exports
snappy.cmake