Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-01-17 | 1 | -3/+0 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2019-01-17 | 1 | -3/+0 |
| |\ | |||||
| | * | MDEV-18243 incorrect ASAN instrumentation | Eugene Kosov | 2019-01-15 | 1 | -3/+0 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -4/+59 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -4/+59 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2018-10-28 | 1 | -4/+59 |
| | |\ | |||||
| | | * | 5.6.41-84.1 | Sergei Golubchik | 2018-10-27 | 1 | -4/+59 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 1 | -1/+40 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanja | Oleksandr Byelkin | 2018-07-19 | 1 | -1/+40 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix build on non-Windows, broken by 0897a25c0f0b9b865 | Vladislav Vaintroub | 2018-07-02 | 1 | -0/+2 |
| | * | | MDEV-16596 : Windows - redo log does not work on native 4K sector disks. | Vladislav Vaintroub | 2018-07-02 | 1 | -0/+37 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -7/+25 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -5/+5 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -6/+6 |
| | |\ \ \ | |||||
| | | * | | | MDEV-8743: use O_CLOEXEC (innodb/xtradb) | Daniel Black | 2018-03-02 | 1 | -3/+3 |
| | | * | | | Merge tag 'mariadb-5.5.57' into 5.5-galera | Jan Lindström | 2017-07-20 | 1 | -38/+11 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge branch 'merge-xtradb-5.5' into 5.5mariadb-5.5.57 | Sergei Golubchik | 2017-07-18 | 1 | -38/+11 |
| | | | |\ \ \ | |||||
| | | | | * | | | 5.5.55-38.8 | Sergei Golubchik | 2017-07-18 | 1 | -38/+11 |
| | | * | | | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 1 | -48/+32 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | MDEV-11520: Retry posix_fallocate() after EINTR. | Marko Mäkelä | 2017-03-03 | 1 | -1/+5 |
| | | | * | | | | MDEV-11520 Extending an InnoDB data file unnecessarily allocates | Marko Mäkelä | 2017-02-21 | 1 | -48/+28 |
| | | * | | | | | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 1 | -1/+47 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge branch 'merge-xtradb-5.5' into 5.5 | Sergei Golubchik | 2016-06-14 | 1 | -1/+47 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | 5.5.49-37.9 | Sergei Golubchik | 2016-06-14 | 1 | -1/+47 |
| | | * | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -6/+11 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge branch 'merge/merge-xtradb-5.5' into 5.5 | Sergei Golubchik | 2015-12-09 | 1 | -6/+11 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | 5.5.46-37.6 | Sergei Golubchik | 2015-12-09 | 1 | -6/+11 |
| | | * | | | | | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 1 | -1/+12 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge branch 'merge-xtradb-5.5' into 5.5 | Sergei Golubchik | 2015-10-09 | 1 | -1/+12 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | 5.5.45-37.4 | Sergei Golubchik | 2015-10-08 | 1 | -1/+12 |
| | | | | * | | | move to storage/xtradb/ | Sergei Golubchik | 2015-04-27 | 4 | -0/+7116 |
| | | | | / / | |||||
| | | * | | | | Merge revisions from maria/5.5 | Nirbhay Choubey | 2014-12-16 | 1 | -0/+19 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | * | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 1 | -3/+3 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -5/+45 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -0/+131 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 4 | -9/+13 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -50/+48 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | References lp:1108035 - merged fix from http://bazaar.launchpad.net/~percona-... | Seppo Jaakola | 2013-06-15 | 1 | -0/+9 |
| | | * | | | | | | | | | | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -0/+71 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.30 | Seppo Jaakola | 2013-05-24 | 1 | -5/+18 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -2/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | References: lp:1066784 - Merged with MariaDB 5.5.28a | Seppo Jaakola | 2012-11-30 | 2 | -4/+56 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -0/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1034621 - Merge up to mysql-5.5.25 level | Seppo Jaakola | 2012-08-09 | 3 | -12/+119 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5 | Seppo Jaakola | 2012-04-26 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -1/+22 |
| | * | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 1 | -6/+140 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |