summaryrefslogtreecommitdiff
path: root/storage/xtradb/os
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-05-135-5/+5
|\
| * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| |\
| | * Update FSF AddressVicențiu Ciorbaru2019-05-115-5/+5
| | * Merge branch 'merge/merge-xtradb-5.5' into 5.5mariadb-5.5.62Sergei Golubchik2018-10-241-18/+0
| | |\
| | | * 5.5.61-38.13Sergei Golubchik2018-10-241-18/+0
| * | | Update FSF addressVicențiu Ciorbaru2019-05-114-4/+4
* | | | Merge 10.1 into 10.2Marko Mäkelä2019-01-171-3/+0
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2019-01-171-3/+0
| |\ \ \
| | * | | MDEV-18243 incorrect ASAN instrumentationEugene Kosov2019-01-151-3/+0
* | | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-4/+59
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-4/+59
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2018-10-281-4/+59
| | |\ \ \
| | | * | | 5.6.41-84.1Sergei Golubchik2018-10-271-4/+59
* | | | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-021-1/+40
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanjaOleksandr Byelkin2018-07-191-1/+40
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix build on non-Windows, broken by 0897a25c0f0b9b865Vladislav Vaintroub2018-07-021-0/+2
| | * | | | MDEV-16596 : Windows - redo log does not work on native 4K sector disks.Vladislav Vaintroub2018-07-021-0/+37
* | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-7/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-5/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-6/+6
| | |\ \ \ \ \
| | | * | | | | MDEV-8743: use O_CLOEXEC (innodb/xtradb)Daniel Black2018-03-021-3/+3
| | | * | | | | Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-201-38/+11
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge branch 'merge-xtradb-5.5' into 5.5mariadb-5.5.57Sergei Golubchik2017-07-181-38/+11
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | 5.5.55-38.8Sergei Golubchik2017-07-181-38/+11
| | | * | | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-181-48/+32
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | MDEV-11520: Retry posix_fallocate() after EINTR.Marko Mäkelä2017-03-031-1/+5
| | | | * | | | MDEV-11520 Extending an InnoDB data file unnecessarily allocatesMarko Mäkelä2017-02-211-48/+28
| | | * | | | | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-231-1/+47
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-06-141-1/+47
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | 5.5.49-37.9Sergei Golubchik2016-06-141-1/+47
| | | * | | | | Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-6/+11
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch 'merge/merge-xtradb-5.5' into 5.5Sergei Golubchik2015-12-091-6/+11
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | 5.5.46-37.6Sergei Golubchik2015-12-091-6/+11
| | | * | | | | Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-131-1/+12
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2015-10-091-1/+12
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | 5.5.45-37.4Sergei Golubchik2015-10-081-1/+12
| | | | | * | | move to storage/xtradb/Sergei Golubchik2015-04-274-0/+7116
| | | | | / /
| | | * | | | Merge revisions from maria/5.5Nirbhay Choubey2014-12-161-0/+19
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-091-1/+1
| | | |\ \ \ \
| | | * \ \ \ \ Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-3/+3
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-5/+45
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-0/+131
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ mariadb-5.5.33 mergeSergei Golubchik2013-09-184-9/+13
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-50/+48
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | References lp:1108035 - merged fix from http://bazaar.launchpad.net/~percona-...Seppo Jaakola2013-06-151-0/+9
| | | * | | | | | | | | | References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-0/+71
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-5/+18
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ References: lp:1066784 - Merged with MariaDB 5.5.28aSeppo Jaakola2012-11-302-4/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-0/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status