Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-02 | 25 | -48/+667 |
|\ | |||||
| * | MyRocks: dont show read-Free replication variables | Sergei Petrunia | 2019-06-20 | 1 | -0/+5 |
| * | More Post-merge fixes | Sergei Petrunia | 2019-06-16 | 1 | -1/+1 |
| * | Merge from MyRocks upstream: | Sergei Petrunia | 2019-06-16 | 24 | -48/+662 |
| |\ | |||||
| | * | Copy of | Sergei Petrunia | 2019-06-15 | 24 | -48/+662 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 25 | -11/+745 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2018-08-28 | 25 | -11/+745 |
| |\ \ | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2018-08-28 | 25 | -11/+745 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-06-18 | 2 | -0/+9 |
|\ \ \ | |/ / | |||||
| * | | MDEV-16300 : remove rocksdb checkpoint created by mariabackup. | Vladislav Vaintroub | 2018-06-07 | 2 | -0/+9 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 19 | -141/+352 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2 | Sergei Petrunia | 2018-05-07 | 19 | -141/+352 |
| |\ \ | |||||
| | * \ | Merge from merge-myrocks: | Sergei Petrunia | 2018-01-27 | 19 | -141/+352 |
| | |\ \ | | | |/ | |||||
| | | * | Copy of | Sergei Petrunia | 2018-01-27 | 19 | -142/+353 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Added Max_index_length and Temporary to SHOW TABLE STATUS | Monty | 2018-02-12 | 1 | -4/+4 |
| |/ / / | |||||
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-13 | 2 | -0/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Added a missing result file to the rocksdb_sys_vars result suite | Varun Gupta | 2018-01-12 | 2 | -0/+8 |
| |/ / | |||||
* | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-04 | 1 | -0/+6 |
|\ \ \ | |/ / | |||||
| * | | MDEV-12458: Variable and log records to indicate RocksDB version are missing | Varun Gupta | 2017-12-31 | 1 | -0/+6 |
* | | | Test cleanup related to MDEV-12501 | Vesa Pentti | 2017-12-16 | 1 | -1/+0 |
* | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-12-12 | 2 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | MDEV-14123: .rocksdb folder may break workflow which re-create data directory | Sergei Petrunia | 2017-12-11 | 1 | -1/+1 |
| * | | MDEV-14123: ".rocksdb folder may break workflow", and other MDEVs | Sergei Petrunia | 2017-12-11 | 1 | -1/+1 |
* | | | MDEV-12501 -- set --maturity-level by default | Vesa Pentti | 2017-12-09 | 1 | -2/+1 |
* | | | Revert "MDEV-12501 -- set --maturity-level by default" | Vesa Pentti | 2017-12-05 | 1 | -1/+2 |
* | | | MDEV-12501 -- set --maturity-level by default | Vesa Pentti | 2017-12-04 | 1 | -2/+1 |
|/ / | |||||
* | | Merge branch 'bb-10.2-mariarocks' of github.com:MariaDB/server into 10.2 | Sergei Petrunia | 2017-10-13 | 2 | -4/+4 |
|\ \ | |||||
| * | | Make MyRocks test stable: Data_length may vary slightly as well | Sergei Petrunia | 2017-08-25 | 2 | -4/+4 |
* | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-09-19 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix the merge of rocksdb_sys_vars test suite | Sergei Petrunia | 2017-07-29 | 2 | -8/+2 |
| * | | Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished. | Sergei Petrunia | 2017-07-29 | 46 | -349/+1056 |
| |\ \ | |||||
| * | | | Continuation of the previous cset: rename sysvar's test, too. | Sergei Petrunia | 2017-05-02 | 3 | -8/+8 |
* | | | | Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-09-18 | 73 | -365/+1855 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Copy of | Sergei Petrunia | 2017-09-15 | 25 | -4/+797 |
| |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-07-28 | 140 | -457/+1301 |
* | | rocksdb_sys_vars should not be run if MyRocks is not compiled. | Sergei Petrunia | 2017-04-02 | 1 | -0/+13 |
* | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2017-03-11 | 20 | -142/+495 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-03-11 | 20 | -142/+496 |
* | | Test fixes in rocksdb_sys_vars test suite | Sergei Petrunia | 2017-02-21 | 5 | -4/+25 |
* | | Merge 'merge-myrocks' into 'bb-10.2-mariarocks' | Sergei Petrunia | 2017-02-19 | 12 | -305/+144 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-02-06 | 12 | -305/+144 |
* | | MariaRocks: fix a few tests in rocksdb_sys_vars test suite | Sergei Petrunia | 2017-01-11 | 4 | -4/+3 |
* | | MariaRocks port: get rocksdb_sys_vars.rocksdb_deadlock_detect_basic to work | Sergei Petrunia | 2017-01-11 | 1 | -1/+1 |
* | | MariaRocks port10.2-mariarocks | Sergei Petrunia | 2017-01-11 | 2 | -0/+20 |
* | | Merge remote-tracking branch 'mergetrees/merge-myrocks' into 10.2-mariarocks | Sergei Petrunia | 2017-01-01 | 20 | -211/+632 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2016-12-31 | 21 | -211/+632 |
* | | MariaRocks port: Make rocksdb_sys_vars suite pass | Sergei Petrunia | 2016-12-31 | 101 | -97/+258 |
|/ | |||||
* | Initial commit, | Sergei Petrunia | 2016-10-06 | 198 | -0/+5505 |