summaryrefslogtreecommitdiff
path: root/storage/tokudb
Commit message (Expand)AuthorAgeFilesLines
* MDEV-7635: Update tests to adapt to the new default sql_modeNirbhay Choubey2017-02-1020-25/+41
* MDEV-7635: Test fixesNirbhay Choubey2017-02-1011-1628/+1628
* MDEV-7635: Part 1Nirbhay Choubey2017-02-105-0/+23
* enable tests that were skipped because of have_xtradbSergei Golubchik2016-12-291-1/+1
* Merge branch '10.1' into 10.2Sergei Golubchik2016-12-29151-4040/+7281
|\
| * Merge branch '10.0' into 10.1Sergei Golubchik2016-12-1114-16/+186
| |\
| | * Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-2/+0
| | |\
| | | * str2decimal: don't return a negative zeroSergei Golubchik2016-12-051-2/+0
| | | * MDEV-10247 TokuDB assertion error when building with DEBUGVicențiu Ciorbaru2016-06-171-3/+12
| | | * MDEV-10229: TokuDB fails to build with CLangVicențiu Ciorbaru2016-06-145-28/+9
| | * | MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECTSergei Golubchik2016-12-045-13/+13
| | * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-12-047-1/+171
| | |\ \
| | | * | 5.6.34-79.1Sergei Golubchik2016-12-027-1/+171
| * | | | Parallel replication test case for TokuDB.Kristian Nielsen2016-11-252-0/+972
| * | | | Use thd_kill_level() over old thd_killed() in TokuDB.Kristian Nielsen2016-11-234-20/+20
| * | | | Fix optimistic parallel replication for TokuDB.Kristian Nielsen2016-11-239-20/+163
| * | | | fix bogus stalls in the lock tree for low concurrency applicationsKristian Nielsen2016-11-2321-107/+606
| * | | | fix the tokudb_analyze_in_background_basic test to run on mariadb. mariadb d...Rik Prohaska2016-11-022-11/+15
| * | | | add mtr support files for tokudb_sys_vars testsRik Prohaska2016-11-023-0/+16
| * | | | MDEV-10408 run the tokudb_rpl.rpl_rfr_disable_on_expl_pk_absence test. Add c...Rik Prohaska2016-11-023-3/+2
| * | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-0248-167/+1128
| |\ \ \ \
| | * \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-28113-3865/+5316
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-10292: Tokudb - PerconaFT - compile error in recent gccDaniel Black2016-10-261-2/+0
| | | * | | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-10-2543-162/+1108
| | | |\ \ \ | | | | |/ /
| | | | * | 5.6.33-79.0Sergei Golubchik2016-10-2540-160/+1105
| | | * | | MDEV-10983: TokuDB does not compile on OS X 10.12Vicențiu Ciorbaru2016-10-254-3/+20
| | * | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-2450-1913/+1625
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-24274-6533/+18059
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-298-18/+26
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-237-13/+13
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-193250-297598/+707096
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-313-37/+49
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-2140-128/+638
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-0939-135/+718
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-1829-56/+555
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-2647-87/+468
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-05146-3026/+305643
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281216-25455/+24907
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Fix for build failure in tokudb.Nirbhay Choubey2014-08-141-2/+2
| | * | | | | | | | | | | | | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-1167-757/+2869
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-199-12/+202
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-21420-78173/+86827
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Fix for build failure.Nirbhay Choubey2014-04-151-5/+5
| | * | | | | | | | | | | | | | | | | | | Local merge (mariadb-galera-10.0.10).Nirbhay Choubey2014-04-09647-136663/+153064
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-08615-141103/+148482
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-2673-36/+9057
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | References: lp:1299430 - initial support for tokudb replication in master-sla...Seppo Jaakola2014-03-292-0/+302
| | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-1/+1
| * | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-2875-3709/+4199
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-09-2773-3708/+4192
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | |