summaryrefslogtreecommitdiff
path: root/storage/xtradb/os
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2017-05-061-4/+10
|\
| * MDEV-9566 Prepare xtradb for xtrabackupVladislav Vaintroub2017-04-271-4/+10
* | Merge 10.1 into 10.2Marko Mäkelä2017-04-281-140/+44
|\ \ | |/
| * Merge 10.0 into 10.1Marko Mäkelä2017-04-211-2/+2
| |\
| | * Follow-up to MDEV-12534: Fix warnings on 32-bit systemsMarko Mäkelä2017-04-211-2/+2
| * | Merge 10.0 into 10.1Marko Mäkelä2017-04-211-140/+44
| |\ \ | | |/
| | * MDEV-12534 Use atomic operations whenever availableMarko Mäkelä2017-04-201-139/+44
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-302-166/+148
|\ \ \ | |/ /
| * | compiler warningsSergei Golubchik2017-03-101-1/+1
| * | Fix InnoDB/XtraDB compilation warnings on 32-bit builds.Marko Mäkelä2017-03-091-16/+21
| * | Merge 10.0 into 10.1Marko Mäkelä2017-03-092-52/+29
| |\ \ | | |/
| | * Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.30Vicențiu Ciorbaru2017-03-062-50/+27
| | |\
| | | * Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-03-052-50/+27
| | | |\
| | | | * 5.6.35-80.0Vicențiu Ciorbaru2017-03-042-47/+26
| * | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-031-1/+6
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11520: Retry posix_fallocate() after EINTR.Marko Mäkelä2017-03-031-1/+6
| | |/ /
| * | | Remove an unused variable.Marko Mäkelä2017-02-221-4/+0
| * | | MDEV-11520 after-merge fix for 10.1: Use sparse files.Marko Mäkelä2017-02-221-27/+44
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-02-221-50/+27
| |\ \ \ | | |/ /
| | * | MDEV-11520 Extending an InnoDB data file unnecessarily allocatesMarko Mäkelä2017-02-221-51/+28
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-02-201-28/+33
| |\ \ \ | | |/ /
| | * | MDEV-11802 innodb.innodb_bug14676111 failsMarko Mäkelä2017-02-201-27/+33
* | | | Merge 10.1 into 10.2Marko Mäkelä2016-12-302-6/+2
|\ \ \ \ | |/ / /
| * | | MDEV-9282 Debian: the Lintian complains about "shlib-calls-exit" in ha_innodb.soMarko Mäkelä2016-12-282-6/+2
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-2/+31
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-2/+31
| |\ \ \
| | * \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-2/+31
| | |\ \ \ | | | |/ /
| | | * | Fix build error in XtraDB on Windows.Vladislav Vaintroub2016-10-261-0/+9
| | | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-2/+22
| | | |\ \ | | | | |/
| | | | * 5.6.33-79.0Sergei Golubchik2016-10-251-2/+22
| | * | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-9/+9
| | |\ \ \ | | | |/ /
| | * | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-243-219/+106
| | |\ \ \
| | * \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-10/+12
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-192-111/+50
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-0/+18
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-5/+6
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-19/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-22/+54
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-15/+8
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-262-22/+15
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-052-1/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-282-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-112-12/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | MDEV-6492: MariaDB Galera Cluster cant use rsync sstNirbhay Choubey2014-07-311-1/+23
| | * | | | | | | | | | | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-212-25/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-262-16/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-255-1199/+1707
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-044-9/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-031-51/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \