Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update FSF address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | Fix -Wnonnull-compare | Marko Mäkelä | 2019-04-03 | 1 | -17/+1 |
* | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -13/+6 |
|\ | |||||
| * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -13/+6 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Fix some __attribute__((nonnull)) misuse | Marko Mäkelä | 2017-05-18 | 1 | -2/+4 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-03-05 | 1 | -1/+1 |
| |\ | |||||
| | * | 5.6.35-80.0 | Vicențiu Ciorbaru | 2017-03-04 | 1 | -1/+1 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-04 | 1 | -12/+6 |
|\ \ \ | |/ / | |||||
| * | | MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694 | Marko Mäkelä | 2017-01-03 | 1 | -12/+6 |
| |/ | |||||
* | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -6/+17 |
|\ \ | |||||
| * \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -6/+17 |
| |\ \ | | |/ | |||||
| | * | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 1 | -6/+17 |
| * | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -5/+7 |
| |\ \ | |||||
| * \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -2/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| * | | | | | Merge -r4105..4106 from codership/5.6 | Jan Lindström | 2014-07-04 | 1 | -1/+1 |
| * | | | | | bzr merge -r4091..4101 codership/5.6/ | Nirbhay Choubey | 2014-06-19 | 1 | -4/+4 |
| * | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -5/+6 |
| |\ \ \ \ \ | |||||
| * | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -2/+136 |
* | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -5/+7 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -5/+7 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -5/+7 |
| | * | | | | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+1963 |
| | / / / | |||||
* | | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -2/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -2/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -1/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-02-18 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -2/+137 |
|/ / | |||||
* | | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 1 | -5/+6 |
|/ | |||||
* | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -0/+1962 |