summaryrefslogtreecommitdiff
path: root/storage/tokudb/hatoku_hton.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-85/+98
|\
| * Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-85/+98
| |\
| | * Merge branch '11.0' into 10.1Oleksandr Byelkin2018-09-061-85/+98
| | |\
| | | * TokuDB: Don't free P_S instrumented mutexes after exit()Sergei Golubchik2018-09-061-5/+9
| | | * Merge branch 'merge-tokudb-5.6' into 10.0Oleksandr Byelkin2018-09-061-80/+89
| | | |\
| | | | * 5.6.41-84.1Oleksandr Byelkin2018-09-031-82/+90
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-05-111-1/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-1/+19
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-051-1/+19
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2018-04-261-1/+19
| | | |\ \ | | | | |/
| | | | * 5.6.39-83.1Sergei Golubchik2018-04-241-1/+19
* | | | | Fix a lot of compiler warnings found by -WunusedMonty2018-04-261-5/+5
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-081-12/+40
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-12/+40
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-12/+40
| | |\ \ \ | | | |/ /
| | | * | Make TokuDB run on 10.0Vicențiu Ciorbaru2018-01-241-1/+1
| | | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2018-01-241-11/+39
| | | |\ \ | | | | |/
| | | | * 5.6.38-83.0Vicențiu Ciorbaru2018-01-231-11/+39
* | | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-3/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-3/+4
| | |\ \ \ | | | |/ /
| | | * | Fix tokudb compilation post mergeVicențiu Ciorbaru2017-08-031-3/+4
| | | * | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-08-031-0/+8
| | | |\ \ | | | | |/
| | | | * 5.6.36-82.1Vicențiu Ciorbaru2017-08-031-0/+8
* | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-2/+2
|/ / / /
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-7/+81
|\ \ \ \ | |/ / /
| * | | Fix optimistic parallel replication for TokuDB.Kristian Nielsen2016-11-231-7/+80
| * | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-0/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-10-251-0/+1
| | |\ \ | | | |/
| | | * 5.6.33-79.0Sergei Golubchik2016-10-251-0/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-08-101-2/+2
| | |\ \ | | | |/
| | | * 5.6.31-77.0Sergei Golubchik2016-08-101-2/+2
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-1478/+702
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-1478/+702
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-mergeSergei Golubchik2016-06-111-4/+30
| | |\ \ | | | |/
| | | * 5.6.30-76.3Sergei Golubchik2016-06-101-0/+10
| | | * 5.6.29-76.2Sergei Golubchik2016-04-261-4/+20
| | * | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-mergeSergei Golubchik2016-06-101-1477/+675
| | |\ \ | | | |/
| | | * 5.6.27-76.0Sergei Golubchik2015-12-151-1460/+684
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-291-126/+166
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-126/+166
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2015-12-151-126/+166
| | |\ \ | | | |/
| | | * 5.6.26-74.0Sergei Golubchik2015-10-261-0/+2665
* | | Merge branch '10.1' into 10.2Sergei Golubchik2015-11-201-3/+17
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-3/+17
| |\ \ | | |/
| | * MDEV-8868 Consider adding a check for libjemalloc version in cmake and/or at ...Sergei Golubchik2015-10-221-3/+17
* | | update tokudb to 10.2Sergei Golubchik2015-11-201-4/+4
|/ /
* | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-3/+15
|\ \ | |/