summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/trx0sys.h
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2017-08-311-8/+76
|\
| * Fix test failures on embedded server.Jan Lindström2017-08-311-1/+4
| * Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-7/+72
| |\
| | * MDEV-13471: Test failure on innodb.log_file_size,4kJan Lindström2017-08-101-10/+76
| | * Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-3/+3
| | |\
| | * | Merging InnoDB changes to xtradb (r3783..3808).Nirbhay Choubey2014-03-261-18/+16
| | * | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-208/+199
| | |\ \
| | * \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-2/+2
| | |\ \ \
| | * \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-0/+38
| | |\ \ \ \
| | * | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+30
* | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-9566 Prepare xtradb for xtrabackupVladislav Vaintroub2017-04-271-2/+3
* | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-3/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | 5.6.31-77.0Sergei Golubchik2016-08-101-3/+3
| | * | | | | move to storage/xtradbSergei Golubchik2015-05-041-0/+722
| | / / / /
* | | | | | Few improvements related to CPU cache line size and padding:Alexey Kopytov2016-06-071-7/+7
|/ / / / /
* | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+33
| |_|_|/ |/| | |
* | | | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-198/+184
| |_|/ |/| |
* | | Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-071-2/+2
| |/ |/|
* | Merge with XtraDB as of Percona-Server-5.5.30-rel30.2Sergei Golubchik2013-05-081-0/+38
|/
* XtraDB from Percona-Server-5.5.28-rel29.1Sergei Golubchik2012-11-221-1/+15
* XtraDB from Percona-Server-5.5.27-rel28.1Sergei Golubchik2012-09-051-3/+1
* merged with XtraDB 1.1.8-26.0Sergei Golubchik2012-06-151-0/+6
* Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5unknown2011-12-151-1/+12
* merge with xtradb-5.5.15Sergei Golubchik2011-07-181-22/+27
* Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-031-0/+1
* Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-041-1/+28
* Merge XtraDB 10 into MariaDB.unknown2010-04-281-3/+3
* Merge XtraDB 9 into MariaDB.unknown2010-01-151-0/+6
* Merge XtraDB 8 into MariaDB.unknown2009-11-131-218/+288
* Merge latest XtraDB from lp:percona-xtradb into MariaDB.unknown2009-06-111-1/+6
* Import Percona XtraDB into the MariaDB source tree.unknown2009-06-091-0/+555