Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-14267: correct FSF address | Daniel Black | 2018-10-30 | 1 | -1/+1 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 1 | -2/+0 |
|\ \ | |/ | |||||
| * | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2018-08-28 | 1 | -2/+0 |
| |\ | |||||
| | * | Copy of | Sergei Petrunia | 2018-08-28 | 1 | -2/+0 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge from merge-myrocks: | Sergei Petrunia | 2018-01-27 | 1 | -0/+8 |
| |\ \ | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2018-01-27 | 1 | -0/+8 |
| * | | Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-09-18 | 1 | -12/+37 |
| |\ \ | | |/ | |||||
* | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
* | | | Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished. | Sergei Petrunia | 2017-07-29 | 1 | -12/+37 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-07-28 | 1 | -12/+37 |
* | | Merge 'merge-myrocks' into 'bb-10.2-mariarocks' | Sergei Petrunia | 2017-02-19 | 1 | -98/+68 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-02-06 | 1 | -98/+68 |
* | | Merge remote-tracking branch 'mergetrees/merge-myrocks' into 10.2-mariarocks | Sergei Petrunia | 2017-01-01 | 1 | -16/+18 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2016-12-31 | 1 | -16/+18 |
* | | Add #include <my_config.h> at the start of every .cc file | Sergei Petrunia | 2016-10-09 | 1 | -0/+2 |
|/ | |||||
* | Initial commit, | Sergei Petrunia | 2016-10-06 | 1 | -0/+340 |