summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/univ.i
Commit message (Expand)AuthorAgeFilesLines
* Remove XtraDBMarko Mäkelä2017-06-211-706/+0
* Merge 10.0 into 10.1Marko Mäkelä2017-05-201-10/+4
|\
| * Update xtradb and innodb version to 5.6.36Vicențiu Ciorbaru2017-05-181-1/+1
| * Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-171-9/+3
| |\
| | * 5.6.36-82.0Vicențiu Ciorbaru2017-05-161-9/+3
* | | MDEV-9566 Prepare xtradb for xtrabackupVladislav Vaintroub2017-04-271-1/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-04-211-20/+8
|\ \ \ | |/ /
| * | MDEV-12488 Remove type mismatch in InnoDB printf-like callsMarko Mäkelä2017-04-211-9/+7
| * | MDEV-12534 Use atomic operations whenever availableMarko Mäkelä2017-04-201-11/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-2/+2
|\ \ \ | |/ /
| * | Update xtradb version to match the merged oneVicențiu Ciorbaru2017-03-051-1/+1
| * | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-03-051-1/+1
| |\ \ | | |/
| | * 5.6.35-80.0Vicențiu Ciorbaru2017-03-041-1/+1
* | | Remove an excessive copyright message.Marko Mäkelä2017-01-111-1/+0
* | | Merge 10.0 into 10.1Marko Mäkelä2017-01-111-1/+2
|\ \ \ | |/ /
| * | InnoDB: Enable UNIV_DEBUG_VALGRIND for cmake -DWITH_VALGRINDMarko Mäkelä2017-01-111-1/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-2/+2
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-12-041-2/+2
| |\ \ | | |/
| | * 5.6.34-79.1Sergei Golubchik2016-12-021-1/+1
* | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-1/+1
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-1/+1
| |\ \ | | |/
| | * 5.6.33-79.0Sergei Golubchik2016-10-251-1/+1
* | | Revert "Prepare XtraDB to be used with xtrabackup."Vladislav Vaintroub2016-10-231-1/+1
* | | Prepare XtraDB to be used with xtrabackup.Vladislav Vaintroub2016-10-221-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-2/+2
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-09-271-2/+2
| |\ \ | | |/
| | * 5.6.32-78.1Sergei Golubchik2016-09-271-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-6/+7
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-6/+7
| |\ \ | | |/
| | * 5.6.31-77.0Sergei Golubchik2016-08-101-5/+5
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-2/+2
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 0.0Sergei Golubchik2016-06-211-2/+2
| |\ \ | | |/
| | * 5.6.30-76.3Sergei Golubchik2016-06-211-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-2/+2
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-261-2/+2
| |\ \ | | |/
| | * 5.6.29-76.2Sergei Golubchik2016-04-261-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-2/+2
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-02-161-2/+2
| |\ \ | | |/
| | * 5.6.28-76.1Sergei Golubchik2016-02-161-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-1/+1
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2015-12-131-1/+1
| |\ \ | | |/
| | * 5.6.27-76.0Sergei Golubchik2015-12-131-1/+1
* | | MDEV-9040: 10.1.8 fails after upgrade from 10.0.21Jan Lindström2015-11-051-4/+2
* | | 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