Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -2/+3 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 1 | -2/+3 |
| |\ | |||||
| | * | Merge branch 'merge-tokudb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-05-16 | 1 | -2/+3 |
| | |\ | |||||
| | | * | 5.6.36-82.0 | Vicențiu Ciorbaru | 2017-05-16 | 1 | -2/+3 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge-tokudb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-03-05 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.35-80.0 | Vicențiu Ciorbaru | 2017-03-05 | 1 | -1/+1 |
* | | | | MDEV-11059 don't build the server with jemalloc | Sergei Golubchik | 2017-03-29 | 1 | -6/+8 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge/merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-12-04 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.34-79.1 | Sergei Golubchik | 2016-12-02 | 1 | -1/+1 |
| * | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge/merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 1 | -1/+1 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge/merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.32-78.1 | Sergei Golubchik | 2016-09-27 | 1 | -1/+1 |
* | | | | MDEV-6284: Remove CMakeLists.txt hack that mangled the server install file | Otto Kekäläinen | 2016-10-27 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -5/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge/merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -5/+1 |
| |\ \ | | |/ | |||||
| | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -5/+1 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -7/+13 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge | Sergei Golubchik | 2016-06-11 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | 5.6.30-76.3 | Sergei Golubchik | 2016-06-10 | 1 | -2/+2 |
| | * | 5.6.29-76.2 | Sergei Golubchik | 2016-04-26 | 1 | -1/+1 |
| * | | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge | Sergei Golubchik | 2016-06-10 | 1 | -6/+22 |
| |\ \ | | |/ | |||||
| | * | 5.6.28-76.1 | Sergei Golubchik | 2016-02-16 | 1 | -1/+1 |
| | * | 5.6.27-76.0 | Sergei Golubchik | 2015-12-15 | 1 | -11/+27 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -7/+4 |
|\ \ \ | |/ / | |||||
| * | | MDEV-9351 Fix CPU detection for TokuDB on FreeBSD | Sergei Golubchik | 2016-02-15 | 1 | -7/+4 |
| * | | Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linu... | Vladislav Vaintroub | 2016-01-07 | 1 | -4/+3 |
* | | | Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linu... | Vladislav Vaintroub | 2015-12-24 | 1 | -4/+3 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -13/+33 |
|\ \ \ | |/ / | |||||
| * | | after merge fix debian builds | Sergei Golubchik | 2015-12-15 | 1 | -1/+1 |
| * | | Merge branch 'merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2015-12-15 | 1 | -12/+26 |
| |\ \ | | |/ | |||||
| | * | 5.6.26-74.0 | Sergei Golubchik | 2015-10-26 | 1 | -0/+106 |
| * | Fixed problems found by buildbot: | Monty | 2015-11-27 | 1 | -0/+7 |
* | | fix tokudb compilation with bundled zlib | Sergei Golubchik | 2015-11-19 | 1 | -3/+3 |
* | | MDEV-8962 TokuDB tries to build on OS X, even when disabled in compile flag | Sergei Golubchik | 2015-11-16 | 1 | -5/+11 |
* | | cmake: always use the same function to test for compiler flags | Sergei Golubchik | 2015-09-04 | 1 | -36/+3 |
* | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -1/+1 |
| |\ | |||||
| | * | update tokudb version | Sergei Golubchik | 2015-06-08 | 1 | -1/+1 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Merge commit 'tokudb-engine/tokudb-7.5.6' into 5.5 | Sergei Golubchik | 2015-04-27 | 1 | -1/+1 |
| | |\ | |||||
| | | * | DB-783 append -Wvla to compiler flags to allow variable length arrays to be u... | Rich Prohaska | 2014-12-17 | 1 | -4/+20 |
| | | * | DB-742 use consistent version macros | Rich Prohaska | 2014-10-17 | 1 | -3/+3 |