Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 1 | -1/+3 |
|\ | |||||
| * | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2018-08-28 | 1 | -1/+3 |
| |\ | |||||
| | * | Copy of | Sergei Petrunia | 2018-08-28 | 1 | -1/+3 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 1 | -6/+32 |
|\ \ \ | |/ / | |||||
| * | | Merge from merge-myrocks: | Sergei Petrunia | 2018-01-27 | 1 | -6/+32 |
| |\ \ | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2018-01-27 | 1 | -6/+32 |
* | | | Windows, compiling : reenable warning C4996 (deprecated functions) | Vladislav Vaintroub | 2018-02-07 | 1 | -0/+3 |
* | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -0/+2 |
* | | | 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 | -35/+192 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-07-28 | 1 | -35/+192 |
* | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2017-03-11 | 1 | -7/+14 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-03-11 | 1 | -7/+14 |
* | | MariaRocks: fix compilation on kvm-rpm-centos7-amd64 | Sergei Petrunia | 2017-03-07 | 1 | -0/+3 |
* | | Merge 'merge-myrocks' into 'bb-10.2-mariarocks' | Sergei Petrunia | 2017-02-19 | 1 | -179/+115 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-02-06 | 1 | -179/+115 |
* | | Add ut0counter.h instead of xtradb linked ut0counter.h | Vicențiu Ciorbaru | 2017-01-23 | 1 | -0/+2 |
* | | Merge remote-tracking branch 'mergetrees/merge-myrocks' into 10.2-mariarocks | Sergei Petrunia | 2017-01-01 | 1 | -32/+96 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2016-12-31 | 1 | -32/+95 |
* | | MariaRocks port: dir_entry has number_of_files with one 'f' in MariaDB | Sergei Petrunia | 2016-10-09 | 1 | -1/+1 |
* | | 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/+417 |