Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into 10.3mariadb-10.3.33 | Oleksandr Byelkin | 2022-01-29 | 1 | -0/+2 |
|\ | |||||
| * | MDEV-27149: Add rocksdb_ignore_datadic_errorsbb-10.2-psergey | Sergei Petrunia | 2022-01-21 | 1 | -0/+2 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2021-10-28 | 1 | -9/+7 |
|\ \ | |/ | |||||
| * | Fix compile warning:bb-10.2-tmp | Sergei Petrunia | 2021-10-27 | 1 | -9/+7 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-02 | 1 | -524/+127 |
|\ \ | |/ | |||||
| * | MyRocks: dont show read-Free replication variables | Sergei Petrunia | 2019-06-20 | 1 | -3/+4 |
| * | Merge from MyRocks upstream: | Sergei Petrunia | 2019-06-16 | 1 | -522/+124 |
| |\ | |||||
| | * | Copy of | Sergei Petrunia | 2019-06-15 | 1 | -522/+122 |
| * | | MDEV-17045: MyRocks tables cannot be updated when binlog_format=MIXED.bb-10.2-mdev17045 | Sergei Petrunia | 2019-06-15 | 1 | -25/+1 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-06-19 | 1 | -25/+1 |
|\ \ \ | |||||
| * | | | MDEV-17045: MyRocks tables cannot be updated when binlog_format=MIXED. | Sergei Petrunia | 2019-06-16 | 1 | -25/+1 |
| |/ / | |||||
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-14267: correct FSF address | Daniel Black | 2018-10-30 | 1 | -1/+1 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 1 | -24/+29 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2018-08-28 | 1 | -24/+29 |
| |\ \ | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2018-08-28 | 1 | -17/+30 |
* | | | Merge branch 'github/10.2' into 10.3 | Sergei Golubchik | 2018-05-22 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Set MyRocks plugin version to Stable | Sergei Petrunia | 2018-05-21 | 1 | -1/+1 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-17 | 1 | -2/+10 |
|\ \ \ | |/ / | |||||
| * | | MDEV-16155: UPDATE on RocksDB table with unique constraint does not work | Sergei Petrunia | 2018-05-15 | 1 | -2/+10 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 1 | -26/+79 |
|\ \ \ | |/ / | |||||
| * | | MyRocks: fix rocksdb.rocksdb_range test attempt 3 | Sergei Petrunia | 2018-05-08 | 1 | -0/+4 |
| * | | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2 | Sergei Petrunia | 2018-05-07 | 1 | -26/+75 |
| |\ \ | |||||
| | * \ | Merge from merge-myrocks: | Sergei Petrunia | 2018-01-27 | 1 | -26/+76 |
| | |\ \ | | | |/ | |||||
| | | * | Copy of | Sergei Petrunia | 2018-01-27 | 1 | -26/+76 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-04-23 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | MyRocks: MDEV-15911: Reduce debug logging on default levels in error log | Sergei Petrunia | 2018-04-19 | 1 | -0/+4 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-03-29 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-15686: Loading MyRocks plugin back after it has been unloaded causes a c... | Sergei Petrunia | 2018-03-28 | 1 | -0/+1 |
* | | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2018-02-22 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Change MyRocks Maturity Level from Beta to Gamma (RC)bb-10.2-mdev15372 | Sergei Petrunia | 2018-02-21 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2018-01-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Change MyRocks maturity from Alpha to Beta | Sergei Petrunia | 2018-01-12 | 1 | -1/+1 |
* | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-12-19 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | MDEV-14679: RocksdB plugin fails to load with "Loading of unknown plugin ROCK... | Sergei Petrunia | 2017-12-16 | 1 | -0/+3 |
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-18 | 1 | -8/+64 |
|\ \ \ | |/ / | |||||
| * | | Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-09-18 | 1 | -48/+200 |
| |\ \ | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2017-09-15 | 1 | -8/+64 |
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-08-07 | 1 | -41/+137 |
|\ \ \ | |||||
| * \ \ | Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished. | Sergei Petrunia | 2017-07-29 | 1 | -41/+137 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2017-07-28 | 1 | -41/+137 |
* | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -1/+1 |
* | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 1 | -1/+1 |
|/ / | |||||
* | | move rocksdb specific changes into rocksdb | Sergei Golubchik | 2017-03-31 | 1 | -0/+1 |
* | | don't export all charsets to plugins | Sergei Golubchik | 2017-03-31 | 1 | -0/+11 |
* | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2017-03-11 | 1 | -15/+67 |
|\ \ | |/ | |||||
| * | Copy of | Sergei Petrunia | 2017-03-11 | 1 | -8/+65 |
* | | Merge between local changes bb-10.2-mariarocks and the merge from upstream | Sergei Petrunia | 2017-02-20 | 1 | -0/+8 |
|\ \ | |||||
| * | | MDEV-11901 : MariaRocks on Windows | Vladislav Vaintroub | 2017-02-01 | 1 | -0/+8 |
* | | | Merge 'merge-myrocks' into 'bb-10.2-mariarocks' | Sergei Petrunia | 2017-02-19 | 1 | -438/+493 |
|\ \ \ | |/ / |/| / | |/ |