Marko Mäkelä d1e6b0bcff MDEV-20927 Duplicate key with auto increment ... Apply the changes to InnoDB and XtraDB that had been inadvertently skipped in the merge commit ae476868a5 That merge failure sabotaged part of MDEV-20127: >Revert a problematic auto_increment_increment 'fix' from 2014. >This involves replacing the MDEV-8827 fix and in 10.1, >removing some WSREP instrumentation. The code changes were re-merged manually by executing the following: # Get the parent of the problematic merge. git checkout ae476868a5394041a00e75a29c7d45917e8dfae8^ # Perform the merge again. git merge ae476868a5394041a00e75a29c7d45917e8dfae8^2 # Get the conflict resolution from that merge. git checkout ae476868a5 . # Note: Any changes to these files were removed (empty diff)! git diff HEAD storage/{innobase,xtradb}/handler/ha_innodb.cc # Apply the code changes: git diff cf40393471b10ca68cc1d2804c22ab9203900978^2..MERGE_HEAD \ storage/{innobase,xtradb}/handler/ha_innodb.cc| patch -p1		2019-10-30 13:21:36 +02:00
..
ha_innodb.cc	MDEV-20927 Duplicate key with auto increment	2019-10-30 13:21:36 +02:00
ha_innodb.h	imporve clang build	2019-06-25 13:21:36 +03:00
handler0alter.cc	MDEV-19529 InnoDB hang on DROP FULLTEXT INDEX	2019-09-18 13:22:08 +05:30
i_s.cc	MDEV-19445 heap-use-after-free related to innodb_ft_aux_table	2019-05-13 17:16:42 +03:00
i_s.h	MDEV-19445 heap-use-after-free related to innodb_ft_aux_table	2019-05-13 17:16:42 +03:00