| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 1 | -2/+3 |
| |\ | |||||
| | * | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2018-08-28 | 1 | -2/+3 |
| | |\ | |||||
| | | * | Copy of | Sergei Petrunia | 2018-08-28 | 1 | -7/+24 |
| * | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 1 | -6/+155 |
| |\ \ \ | |/ / | |||||
| | * | | Cherry-picked from MyRocks upstream: Issue #809: Wrong query result with bloo... | Sergei Petrunia | 2018-05-07 | 1 | -5/+21 |
| | * | | Merge from merge-myrocks: | Sergei Petrunia | 2018-01-27 | 1 | -6/+139 |
| | |\ \ | | |/ | |||||
| | | * | Copy of | Sergei Petrunia | 2018-01-27 | 1 | -6/+139 |
| * | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-13 | 1 | -1/+4 |
| |\ \ \ | |/ / | |||||
| | * | | MDEV-14372: Fix and enable rocksdb.information_schema test | Sergei Petrunia | 2018-01-12 | 1 | -1/+4 |
| * | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-12-19 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | MDEV-14293: MyRocks lacks basic functionality | Sergei Petrunia | 2017-12-15 | 1 | -0/+2 |
| * | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -6/+62 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'bb-10.2-mariarocks' of github.com:MariaDB/server into 10.2 | Sergei Petrunia | 2017-10-13 | 1 | -1/+0 |
| | |\ \ | |||||
| | | * | | Enable basic XA between MyRocks and the binlog | Sergei Petrunia | 2017-08-25 | 1 | -1/+0 |
| | * | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-10-13 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | MDEV-13974: Build failure in rocksdb/rdb_datadic.cc | Varun Gupta | 2017-10-10 | 1 | -0/+1 |
| | | |/ / | |||||
| | * | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-09-19 | 1 | -0/+1 |
| | |\ \ \ | | |/ / | |||||
| | * | | | Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-09-18 | 1 | -43/+334 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Copy of | Sergei Petrunia | 2017-09-15 | 1 | -5/+61 |
| * | | | | Added DBUG_ASSERT_AS_PRINTF compile flag | Monty | 2017-08-24 | 1 | -0/+4 |
| | |_|/ |/| | | |||||
| * | | | Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished. | Sergei Petrunia | 2017-07-29 | 1 | -41/+276 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Copy of | Sergei Petrunia | 2017-07-28 | 1 | -41/+276 |
| * | | | Fix a compiler warning | Sergei Petrunia | 2017-05-17 | 1 | -0/+1 |
| | |/ |/| | |||||
| * | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2017-03-11 | 1 | -5/+35 |
| |\ \ | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2017-03-11 | 1 | -5/+35 |
| * | | Merge between local changes bb-10.2-mariarocks and the merge from upstream | Sergei Petrunia | 2017-02-20 | 1 | -0/+3 |
| |\ \ | |/ |/| | |||||
| | * | MDEV-11901 : MariaRocks on Windows | Vladislav Vaintroub | 2017-02-01 | 1 | -0/+3 |
| * | | Copy of | Sergei Petrunia | 2017-02-06 | 1 | -353/+288 |
| |/ | |||||
| * | Copy of | Sergei Petrunia | 2016-12-31 | 1 | -114/+161 |
| * | Initial commit, | Sergei Petrunia | 2016-10-06 | 1 | -0/+1054 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |