summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/univ.i
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-2/+3
|\
| * fixes for buildbot:Sergei Golubchik2015-10-101-0/+1
| * Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-10-091-2/+2
| |\
| | * 5.6.26-74.0Sergei Golubchik2015-10-091-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-2/+2
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-08-031-2/+2
| |\ \ | | |/
| | * 5.6.25-73.1Sergei Golubchik2015-08-011-1/+1
* | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-2/+2
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-06-161-2/+2
| |\ \ | | |/
| | * 5.6.24-72.2Sergei Golubchik2015-06-161-1/+1
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-2/+2
|\ \ \ | |/ /
| * | XtraDB-5.6.23-72.1Sergei Golubchik2015-05-051-2/+2
| |\ \ | | |/
| | * 5.6.23-72.1Sergei Golubchik2015-05-041-1/+1
| | * move to storage/xtradbSergei Golubchik2015-05-041-0/+686
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-1/+1
|\ \ | |/
| * xtradb 5.6.22-72.0Sergei Golubchik2015-02-181-1/+1
* | Merged from 10.0-FusionIO:Jan Lindström2015-02-191-1/+7
* | Fixed XtraDB implementation of encryption and page encryption.Jan Lindström2015-02-101-0/+3
* | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-2/+6
|\ \ | |/
| * XtraDB 5.6.22-71.0Sergei Golubchik2015-01-211-2/+6
* | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-2/+2
|\ \ | |/
| * XtraDB 5.6.21-70.0Sergei Golubchik2014-11-201-2/+2
* | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-6/+6
|\ \ | |/
| * XtraDB 5.6.20-68.0Sergei Golubchik2014-09-111-2/+2
| * xtradb-5.6.19-67.0Sergei Golubchik2014-08-061-6/+6
* | MDEV-6354: Implement a way to read MySQL 5.7.4-labs-tplc pageJan Lindström2014-07-221-0/+13
* | MDEV-6392: Change innodb_have_lzo and innodb_have_lz4 as a staticJan Lindström2014-06-261-0/+12
* | Merge 10.0 -> 10.1Jan Lindström2014-05-241-2/+2
|\ \ | |/
| * xtradb 5.6.17-65.0Sergei Golubchik2014-05-071-2/+2
* | MDEV-6075: Allow > 16K pages on InnoDBJan Lindström2014-05-131-1/+3
|/
* MDEV-6184 10.0.11 mergeSergei Golubchik2014-05-061-3/+3
* Percona-Server-5.6.15-rel63.0.tar.gz mergeSergei Golubchik2014-02-261-2/+2
* Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-99/+226
* Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-071-3/+3
* Merge with XtraDB as of Percona-Server-5.5.30-rel30.2Sergei Golubchik2013-05-081-1/+1
* merge with XtraDB as of Percona-Server-5.5.30-rel30.1Sergei Golubchik2013-03-081-11/+8
* merge with XtraDB as of Percona-Server-5.5.29-rel30.0Sergei Golubchik2013-02-281-0/+18
* xtradb merge. Percona-Server-5.5.28-rel29.3Sergei Golubchik2013-01-161-1/+1
* XtraDB from Percona-Server-5.5.28-rel29.1Sergei Golubchik2012-11-221-1/+1
* XtraDB 1.1.8-29.0Sergei Golubchik2012-10-161-1/+1
* XtraDB from Percona-Server-5.5.27-rel28.1Sergei Golubchik2012-09-051-1/+1
* merge XtraDB 1.1.8-27.0 from Percona-Server-5.5.25a-rel27.1Sergei Golubchik2012-08-221-4/+1
* merged with XtraDB 1.1.8-26.0Sergei Golubchik2012-06-151-23/+12
* commentsSergei Golubchik2012-06-151-0/+3
* Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5.unknown2012-02-151-1/+1
* merge with 5.3Sergei Golubchik2011-10-191-1/+0
|\
| * Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-291-5/+6
| * Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-221-1/+13
| * Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-041-2/+5
| * Merge XtraDB from Percona-Server 5.1.52-11.6 into MariaDB 5.1unknown2010-11-241-2/+2