Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.5 into 10.6 | Marko Mäkelä | 2021-10-27 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.4 into 10.5 | Marko Mäkelä | 2021-10-21 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge 10.3 into 10.4st-10.4-merge | Marko Mäkelä | 2021-10-21 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge 10.2 into 10.3 | Marko Mäkelä | 2021-10-21 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | MDEV-19129: Xcode compatibility update: mysql-test-run.pl: rename $opt_vs_con... | Sergei Krivonos | 2021-10-21 | 1 | -1/+1 |
* | | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2021-04-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-08-21 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-08-21 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-08-21 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
* | | | | MDEV-742 XA PREPAREd transaction survive disconnect/server restart | Andrei Elkin | 2020-03-14 | 3 | -0/+152 |
|/ / / | |||||
* | | | Merge branch '10.3' into 10.4 | Sergei Golubchik | 2019-09-06 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-09-06 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | don't run RocksDB suites by default | Sergei Golubchik | 2019-09-06 | 1 | -1/+1 |
* | | | Merge branch '10.3' into 10.4 | Sergei Golubchik | 2019-09-06 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.2' into 10.3 | Monty | 2019-09-03 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | Updated mtr files to support different compiled in options | Monty | 2019-09-01 | 1 | -1/+0 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-07-25 | 2 | -5/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-25 | 1 | -5/+0 |
| |\ \ | | |/ | |||||
| | * | RocksDB: Do not test bogus parameter slave_gtid_info | Marko Mäkelä | 2019-07-25 | 1 | -5/+0 |
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-19 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Disable rocksdb_rpl.rpl_gtid_crash_safe_optimized | Sergei Petrunia | 2019-07-16 | 1 | -0/+1 |
| | * | Disable rocksdb_rpl.optimize_myrocks_replace_into | Sergei Petrunia | 2019-07-16 | 1 | -0/+1 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-07-02 | 18 | -39/+1138 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-02 | 18 | -39/+1138 |
| |\ \ | | |/ | |||||
| | * | Fix typo | Sergei Petrunia | 2019-06-16 | 1 | -1/+1 |
| | * | More Post-merge fixes | Sergei Petrunia | 2019-06-16 | 1 | -1/+2 |
| | * | Merge from MyRocks upstream: | Sergei Petrunia | 2019-06-16 | 17 | -38/+1136 |
| | |\ | |||||
| | | * | Copy of | Sergei Petrunia | 2019-06-15 | 17 | -38/+1136 |
* | | | | Move deletion of old GTID rows to slave background thread | Kristian Nielsen | 2018-12-07 | 2 | -0/+103 |
|/ / / | |||||
* | | | Revert "MDEV-16768: fix blob key length" | Sergei Golubchik | 2018-09-21 | 2 | -24/+0 |
* | | | MDEV-16768: fix blob key length | Ming Lin | 2018-09-12 | 2 | -0/+24 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 10 | -4/+265 |
|\ \ \ | |/ / | |||||
| * | | Post-merge fixes: Disable rpl_mts_dependency_unique_key_conflicts test | Sergei Petrunia | 2018-09-03 | 1 | -0/+1 |
| * | | MyRocks: post-merge fixes part #9: disable rocksdb_rpl.rpl_missing_columns_sk... | Sergei Petrunia | 2018-08-30 | 1 | -0/+1 |
| * | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2018-08-28 | 9 | -4/+263 |
| |\ \ | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2018-08-28 | 9 | -4/+263 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 4 | -0/+9 |
|\ \ \ | |/ / | |||||
| * | | Merge from merge-myrocks: | Sergei Petrunia | 2018-01-27 | 4 | -0/+9 |
| |\ \ | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2018-01-27 | 4 | -0/+9 |
* | | | Create rocksdb_rpl.mdev12179 by taking tokudb_rpl.mdev12179 and adjusting it | Sergei Petrunia | 2018-01-29 | 2 | -0/+497 |
* | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-04 | 8 | -21/+259 |
|\ \ \ | |/ / | |||||
| * | | Fix a typo in previous commit | Sergei Petrunia | 2017-12-22 | 1 | -1/+1 |
| * | | Better comments: explain why slave_use_idempotent_for_recovery is disabled | Sergei Petrunia | 2017-12-22 | 1 | -2/+1 |
| * | | More fixes in MyRocks' rocksdb_rpl testsuite | Sergei Petrunia | 2017-12-22 | 5 | -15/+21 |
| * | | Cleanup in storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def | Sergei Petrunia | 2017-12-22 | 1 | -1/+1 |
| * | | Merge branch '10.2' into bb-10.2-mariarocks | Sergei Petrunia | 2017-12-21 | 1 | -4/+10 |
| |\ \ | |||||
| | * | | Better comments part #2 | Sergei Petrunia | 2017-12-21 | 1 | -2/+1 |
| | * | | Better comments part #1 | Sergei Petrunia | 2017-12-21 | 1 | -3/+10 |
| * | | | MDEV-14290 Binlog rotate crashes when two commit_checkpoint_notify capable en... | Andrei Elkin | 2017-12-11 | 3 | -0/+227 |
| |/ / | |||||
* | | | Test cleanup related to MDEV-12501 | Vesa Pentti | 2017-12-16 | 1 | -1/+1 |