MariaDB server is a community developed fork of MySQL server. Started by core members of the original MySQL team, MariaDB actively works with outside developers to deliver the most featureful, stable, and sanely licensed open SQL server in the industry.
Find a file
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
BUILD Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
client Merge 5.5 into 10.1 2019-10-29 22:10:43 +03:00
cmake Merge remote-tracking branch 'origin/5.5' into 10.1 2019-09-24 11:18:39 +04:00
dbug remove unused struct members 2019-10-29 23:02:03 +03:00
debian Remove bogus advice 2019-10-28 16:03:00 +02:00
Docs MDEV-19563 Removed references to deprecated option innodb_locks_unsafe_for_binlog 2019-06-12 13:00:08 +03:00
extra MDEV-17638 Improve error message about corruption of encrypted page 2019-08-01 16:49:17 +03:00
include fix clang warnings 2019-08-28 10:14:20 +03:00
libmysql Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
libmysqld Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
libservices Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
man MDEV-19537: Document mysqlimport option ignore-foreign-keys 2019-05-21 17:04:18 +04:00
mysql-test MDEV-20927 Duplicate key with auto increment 2019-10-30 13:21:36 +02:00
mysys Merge 5.5 into 10.1 2019-05-28 11:25:45 +03:00
mysys_ssl Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
pcre
plugin Merge branch '5.5' into 10.1 2019-07-25 13:27:11 +02:00
randgen/conf
scripts Merge branch 'github/5.5' into 10.1 2019-10-23 15:55:23 +02:00
sql avoid accessing TLS 2019-10-30 13:23:15 +03:00
sql-bench Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
sql-common MDEV-19034 ASAN unknown-crash in get_date_time_separator with PAD_CHAR_TO_FULL_LENGTH 2019-08-20 05:28:14 +04:00
storage MDEV-20927 Duplicate key with auto increment 2019-10-30 13:21:36 +02:00
strings Merge branch 'github/5.5' into 10.1 2019-10-23 15:55:23 +02:00
support-files chkconfig in RPM server scriptlets 2019-09-27 13:20:11 +02:00
tests Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
unittest Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
vio Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
win Merge branch '5.5' into 10.1 2019-07-25 13:27:11 +02:00
wsrep Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
zlib restore RESTRICT_SYMBOL_EXPORTS(zlib) 2019-07-10 08:58:28 +02:00
.clang-format MDEV-13631 Make use of clang-format 2019-06-12 22:36:43 +03:00
.gitattributes
.gitignore
BUILD-CMAKE
CMakeLists.txt MDEV-19360 - Disable _FORTIFY_SOURCE for ASAN builds 2019-06-07 12:47:41 +04:00
config.h.cmake Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
configure.cmake Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
COPYING
COPYING.thirdparty Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
CREDITS
EXCEPTIONS-CLIENT
INSTALL-SOURCE
INSTALL-WIN-SOURCE
KNOWN_BUGS.txt
README
VERSION bump the VERSION 2019-07-31 09:55:57 -04:00

MariaDB is designed as a drop-in replacement of MySQL(R) with more
features, new storage engines, fewer bugs, and better performance.

MariaDB is brought to you by the MariaDB Foundation.
Please read the CREDITS file for details about the MariaDB Foundation,
and who is developing MariaDB.

MariaDB is developed by many of the original developers of MySQL who
now work for the MariadB Foundation and the MariaDB Corporation, and by many people in
the community.

MySQL, which is the base of MariaDB, is a product and trademark of Oracle
Corporation, Inc. For a list of developers and other contributors,
see the Credits appendix.  You can also run 'SHOW authors' to get a
list of active contributors.

A description of the MariaDB project and a manual can be found at:
http://mariadb.org/
https://mariadb.com/kb/en/
https://mariadb.com/kb/en/mariadb-vs-mysql-features/
https://mariadb.com/kb/en/mariadb-versus-mysql-features/
https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/

As MariaDB is a full replacement of MySQL, the MySQL manual at
http://dev.mysql.com/doc is generally applicable.

More help is available from the Maria Discuss mailing list
https://launchpad.net/~maria-discuss
and the #maria IRC channel on Freenode.

***************************************************************************

NOTE: 

MariaDB is specifically available only under version 2 of the GNU
General Public License (GPLv2). (I.e. Without the "any later version"
clause.) This is inherited from MySQL. Please see the README file in
the MySQL distribution for more information.

License information can be found in the COPYING, COPYING.LESSER,
and COPYING.thirdparty files.

***************************************************************************

IMPORTANT:

Bug and/or error reports regarding MariaDB should be submitted at:
https://jira.mariadb.org

For reporting security vulnerabilities see:
https://mariadb.org/about/security-policy/

Bugs in the MySQL code can also be submitted at:
http://bugs.mysql.com

The code for MariaDB, including all revision history, can be found at:
https://github.com/MariaDB/server

***************************************************************************