summaryrefslogtreecommitdiff
path: root/storage/xtradb/mtr
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0 into 10.1Marko Mäkelä2017-03-091-1/+0
|\
| * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-1/+0
| |\
| | * Fix gcc 6.3.x compiler warnings.Jan Lindström2017-02-161-1/+0
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-4/+4
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-4/+4
| |\ \
| | * | 5.6.31-77.0Sergei Golubchik2016-08-101-4/+4
* | | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-06-161-1/+1
| |\ \ \ | | |/ /
| | * | 5.6.24-72.2Sergei Golubchik2015-06-161-1/+1
| | * | move to storage/xtradbSergei Golubchik2015-05-042-0/+1050
| | /
* | | Push for testing of encryptionMonty2015-02-102-4/+48
|/ /
* | MDEV-6184 10.0.11 mergeSergei Golubchik2014-05-061-1/+1
* | Percona-Server-5.6.15-rel63.0.tar.gz mergeSergei Golubchik2014-02-261-13/+16
* | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-222-118/+133
|/
* Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-071-2/+2
* merge Percona-Server-5.5.32-rel31.0.tar.gzSergei Golubchik2013-07-161-73/+76
* Merge with XtraDB as of Percona-Server-5.5.30-rel30.2Sergei Golubchik2013-05-081-4/+35
* merged with XtraDB 1.1.8-26.0Sergei Golubchik2012-06-151-3/+3
* Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5unknown2011-12-151-38/+0
* merge with xtradb-5.5.15Sergei Golubchik2011-07-182-83/+107
* After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and...unknown2010-04-281-1/+1
* Merge XtraDB 9 into MariaDB.unknown2010-01-151-3/+5
* Merge XtraDB 8 into MariaDB.unknown2009-11-132-108/+123
* Fix most Compiler warnings seen in buildbot.unknown2009-09-031-0/+1
* Merge XtraDB 6 into MariaDB.unknown2009-08-031-2/+43
* Import Percona XtraDB into the MariaDB source tree.unknown2009-06-092-0/+954