Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-02 | 1 | -5/+5 |
|\ | |||||
| * | Merge from MyRocks upstream: | Sergei Petrunia | 2019-06-16 | 1 | -5/+5 |
| |\ | |||||
| | * | Copy of | Sergei Petrunia | 2019-06-15 | 1 | -5/+5 |
* | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-17 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | post-merge: gcc 8 warnings | Sergei Golubchik | 2019-03-15 | 1 | -1/+1 |
* | | | 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 |
* | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2017-03-11 | 1 | -19/+12 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-03-11 | 1 | -18/+11 |
* | | Fix build on Windows. | Vladislav Vaintroub | 2017-03-07 | 1 | -1/+2 |
* | | Merge 'merge-myrocks' into 'bb-10.2-mariarocks' | Sergei Petrunia | 2017-02-19 | 1 | -26/+32 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-02-06 | 1 | -26/+32 |
* | | Merge remote-tracking branch 'mergetrees/merge-myrocks' into 10.2-mariarocks | Sergei Petrunia | 2017-01-01 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2016-12-31 | 1 | -3/+3 |
* | | 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/+81 |