Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -85/+98 |
|\ | |||||
| * | Merge branch '11.0' into 10.1 | Oleksandr Byelkin | 2018-09-06 | 1 | -85/+98 |
| |\ | |||||
| | * | TokuDB: Don't free P_S instrumented mutexes after exit() | Sergei Golubchik | 2018-09-06 | 1 | -5/+9 |
| | * | Merge branch 'merge-tokudb-5.6' into 10.0 | Oleksandr Byelkin | 2018-09-06 | 1 | -80/+89 |
| | |\ | |||||
| | | * | 5.6.41-84.1 | Oleksandr Byelkin | 2018-09-03 | 1 | -82/+90 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-10 | 1 | -1/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-05 | 1 | -1/+19 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2018-04-26 | 1 | -1/+19 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.39-83.1 | Sergei Golubchik | 2018-04-24 | 1 | -1/+19 |
* | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -12/+40 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -12/+40 |
| |\ \ \ | | |/ / | |||||
| | * | | Make TokuDB run on 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -1/+1 |
| | * | | Merge branch 'merge-tokudb-5.6' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -11/+39 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.38-83.0 | Vicențiu Ciorbaru | 2018-01-23 | 1 | -11/+39 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -3/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix tokudb compilation post merge | Vicențiu Ciorbaru | 2017-08-03 | 1 | -3/+4 |
| | * | | Merge branch 'merge-tokudb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-08-03 | 1 | -0/+8 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.36-82.1 | Vicențiu Ciorbaru | 2017-08-03 | 1 | -0/+8 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -7/+81 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix optimistic parallel replication for TokuDB. | Kristian Nielsen | 2016-11-23 | 1 | -7/+80 |
| * | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge/merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 1 | -0/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge/merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -2/+2 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -1478/+702 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -1478/+702 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge | Sergei Golubchik | 2016-06-11 | 1 | -4/+30 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.30-76.3 | Sergei Golubchik | 2016-06-10 | 1 | -0/+10 |
| | | * | 5.6.29-76.2 | Sergei Golubchik | 2016-04-26 | 1 | -4/+20 |
| | * | | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge | Sergei Golubchik | 2016-06-10 | 1 | -1477/+675 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.27-76.0 | Sergei Golubchik | 2015-12-15 | 1 | -1460/+684 |
* | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Alexander Barkov | 2015-12-29 | 1 | -126/+166 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -126/+166 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2015-12-15 | 1 | -126/+166 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.26-74.0 | Sergei Golubchik | 2015-10-26 | 1 | -0/+2665 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2015-11-20 | 1 | -3/+17 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -3/+17 |
| |\ \ | | |/ | |||||
| | * | MDEV-8868 Consider adding a check for libjemalloc version in cmake and/or at ... | Sergei Golubchik | 2015-10-22 | 1 | -3/+17 |
* | | | update tokudb to 10.2 | Sergei Golubchik | 2015-11-20 | 1 | -4/+4 |
|/ / | |||||
* | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -3/+15 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -3/+15 |
| |\ | |||||
| | * | Merge tag 'tokudb-engine/tokudb-7.5.7' into 5.5 | Sergei Golubchik | 2015-06-03 | 1 | -3/+15 |
| | |\ | |||||
| | | * | DB-832 add start time to tokudb_trx information schema table | Rik Prohaska | 2015-04-06 | 1 | -3/+13 |
| | | * | DB-829 ignore read uncommitted errors when querying tokudb_fractal_tree_info | Rik Prohaska | 2015-03-25 | 1 | -0/+2 |
* | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -20/+40 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -20/+40 |
| |\ \ \ | | |/ / |