summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/row0merge.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-6/+1
|\
| * MDEV-13838: Wrong result after altering a partitioned tableJan Lindström2017-10-101-6/+1
* | MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytes written to tem…Jan Lindström2017-09-141-18/+12
* | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-17/+17
|\ \ | |/
| * Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-19/+19
| |\
| | * 5.6.31-77.0Sergei Golubchik2016-08-101-19/+19
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-12/+14
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-261-11/+13
| |\ \ | | |/
| | * 5.6.29-76.2Sergei Golubchik2016-04-261-11/+13
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-1/+4
|\ \ \ | |/ /
| * | MDEV-9548: Alter table (renaming and adding index) fails with "Incorrect key ...Jan Lindström2016-02-151-1/+4
* | | MDEV-9129: Server is restarting in the loop after crashJan Lindström2015-12-151-0/+3
* | | MDEV-8774: Test innodb.innodb_bug53290 failures on buildbotJan Lindström2015-09-081-1/+1
* | | MDEV-8774: Test innodb.innodb_bug53290 failures on buildbotJan Lindström2015-09-081-1/+1
* | | MDEV-8708: InnoDB temp file encryptionJan Lindström2015-09-081-4/+19
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-1/+1
|\ \ \ | |/ /
| * | XtraDB-5.6.23-72.1Sergei Golubchik2015-05-051-1/+1
| |\ \ | | |/
| | * 5.6.23-72.1Sergei Golubchik2015-05-041-1/+1
| | * move to storage/xtradbSergei Golubchik2015-05-041-0/+430
* | Merge 10.0 -> 10.1Kristian Nielsen2015-04-201-0/+1
|\ \ | |/
| * MDEV-7367: Updating a virtual column corrupts table which crashes serverJan Lindström2015-03-311-0/+1
* | MDEV-6812: Merge Kakao: Add global status variables which tellJan Lindström2014-09-301-1/+16
|/
* Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-67/+300
* Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-071-2/+2
* merge with xtradb-5.5.15Sergei Golubchik2011-07-181-1/+1
* lots of post-merge changesSergei Golubchik2011-04-251-1/+1
* Merge XtraDB 8 into MariaDB.unknown2009-11-131-76/+75
* Import Percona XtraDB into the MariaDB source tree.unknown2009-06-091-0/+198