summaryrefslogtreecommitdiff
path: root/storage/tokudb/PerconaFT/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-143-11/+26
|\
| * Merge branch '11.0' into 10.1Oleksandr Byelkin2018-09-063-11/+26
| |\
| | * TokuDB: Don't free P_S instrumented mutexes after exit()Sergei Golubchik2018-09-061-1/+1
| | * Merge branch 'merge-tokudb-5.6' into 10.0Oleksandr Byelkin2018-09-062-10/+25
| | |\
| | | * 5.6.41-84.1Oleksandr Byelkin2018-09-032-10/+25
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-15778: Fix TokuDB build issues on macOS 10.13.4Teodor Mircea Ionita2018-06-101-1/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-109-25/+26
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-059-25/+26
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2018-04-269-25/+26
| | |\ \ | | | |/
| | | * 5.6.39-83.1Sergei Golubchik2018-04-249-25/+26
* | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-0657-348/+768
|\ \ \ \ | |/ / /
| * | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-0257-348/+768
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2018-01-2457-348/+768
| | |\ \ | | | |/
| | | * 5.6.38-83.0Vicențiu Ciorbaru2018-01-2357-348/+768
* | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-192-52/+65
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-192-52/+65
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-09-192-52/+65
| | |\ \ | | | |/
| | | * 5.6.37-82.2Vicențiu Ciorbaru2017-09-192-52/+65
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-174-24/+48
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-084-24/+48
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-08-036-26/+63
| | |\ \ | | | |/
| | | * 5.6.36-82.1Vicențiu Ciorbaru2017-08-036-26/+63
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-231-1/+161
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-201-1/+161
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-05-161-1/+161
| | |\ \ | | | |/
| | | * 5.6.36-82.0Vicențiu Ciorbaru2017-05-161-1/+161
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-2916-146/+286
|\ \ \ \ | |/ / /
| * | | Fix optimistic parallel replication for TokuDB.Kristian Nielsen2016-11-233-4/+19
| * | | fix bogus stalls in the lock tree for low concurrency applicationsKristian Nielsen2016-11-234-9/+16
| |/ /
| * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-10-256-124/+241
| |\ \ | | |/
| | * 5.6.33-79.0Sergei Golubchik2016-10-256-124/+241
| * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-09-2710-12/+13
| |\ \ | | |/
| | * 5.6.32-78.1Sergei Golubchik2016-09-2710-12/+13
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-092-42/+111
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-08-102-42/+111
| |\ \ | | |/
| | * 5.6.31-77.0Sergei Golubchik2016-08-102-42/+111
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-3010-4/+933
|\ \ \ | |/ /
| * | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-mergeSergei Golubchik2016-06-116-45/+40
| |\ \ | | |/
| | * 5.6.30-76.3Sergei Golubchik2016-06-106-45/+40
| * | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-mergeSergei Golubchik2016-06-109-3/+937
| |\ \ | | |/
| | * 5.6.27-76.0Sergei Golubchik2015-12-159-5/+939
* | | Fixed compiler warningsMonty2016-06-223-0/+3
* | | General spell fixing in comments and stringsOtto Kekäläinen2016-06-082-2/+2
|/ /
* | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2015-12-1513-3/+3
|/
* 5.6.26-74.0Sergei Golubchik2015-10-26679-0/+106169