summaryrefslogtreecommitdiff
path: root/storage/tokudb/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2017-05-231-2/+3
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-05-201-2/+3
| |\
| | * Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-05-161-2/+3
| | |\
| | | * 5.6.36-82.0Vicențiu Ciorbaru2017-05-161-2/+3
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-03-051-1/+1
| | |\ \ | | | |/
| | | * 5.6.35-80.0Vicențiu Ciorbaru2017-03-051-1/+1
* | | | MDEV-11059 don't build the server with jemallocSergei Golubchik2017-03-291-6/+8
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-12-041-1/+1
| | |\ \ | | | |/
| | | * 5.6.34-79.1Sergei Golubchik2016-12-021-1/+1
| * | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-10-251-1/+1
| | |\ \ | | | |/
| | | * 5.6.33-79.0Sergei Golubchik2016-10-251-1/+1
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-09-271-1/+1
| | |\ \ | | | |/
| | | * 5.6.32-78.1Sergei Golubchik2016-09-271-1/+1
* | | | MDEV-6284: Remove CMakeLists.txt hack that mangled the server install fileOtto Kekäläinen2016-10-271-1/+0
|/ / /
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-5/+1
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-08-101-5/+1
| |\ \ | | |/
| | * 5.6.31-77.0Sergei Golubchik2016-08-101-5/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-7/+13
|\ \ \ | |/ /
| * | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-mergeSergei Golubchik2016-06-111-2/+2
| |\ \ | | |/
| | * 5.6.30-76.3Sergei Golubchik2016-06-101-2/+2
| | * 5.6.29-76.2Sergei Golubchik2016-04-261-1/+1
| * | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-mergeSergei Golubchik2016-06-101-6/+22
| |\ \ | | |/
| | * 5.6.28-76.1Sergei Golubchik2016-02-161-1/+1
| | * 5.6.27-76.0Sergei Golubchik2015-12-151-11/+27
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-7/+4
|\ \ \ | |/ /
| * | MDEV-9351 Fix CPU detection for TokuDB on FreeBSDSergei Golubchik2016-02-151-7/+4
| * | Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linu...Vladislav Vaintroub2016-01-071-4/+3
* | | Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linu...Vladislav Vaintroub2015-12-241-4/+3
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-13/+33
|\ \ \ | |/ /
| * | after merge fix debian buildsSergei Golubchik2015-12-151-1/+1
| * | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2015-12-151-12/+26
| |\ \ | | |/
| | * 5.6.26-74.0Sergei Golubchik2015-10-261-0/+106
| * Fixed problems found by buildbot:Monty2015-11-271-0/+7
* | fix tokudb compilation with bundled zlibSergei Golubchik2015-11-191-3/+3
* | MDEV-8962 TokuDB tries to build on OS X, even when disabled in compile flagSergei Golubchik2015-11-161-5/+11
* | cmake: always use the same function to test for compiler flagsSergei Golubchik2015-09-041-36/+3
* | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-1/+1
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-1/+1
| |\
| | * update tokudb versionSergei Golubchik2015-06-081-1/+1
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-1/+1
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-1/+1
| |\ \ | | |/
| | * Merge commit 'tokudb-engine/tokudb-7.5.6' into 5.5Sergei Golubchik2015-04-271-1/+1
| | |\
| | | * DB-783 append -Wvla to compiler flags to allow variable length arrays to be u...Rich Prohaska2014-12-171-4/+20
| | | * DB-742 use consistent version macrosRich Prohaska2014-10-171-3/+3