Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-09-04 | 1 | -0/+3 |
|\ | |||||
| * | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-09-04 | 1 | -0/+3 |
| |\ | |||||
| | * | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-09-04 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Fix a typo in the previous cset | Sergei Petrunia | 2020-09-04 | 1 | -1/+1 |
| | | * | MDEV-23661: RocksDB produces "missing initializer for member" warnings | Sergei Petrunia | 2020-09-03 | 1 | -0/+3 |
* | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-08-01 | 1 | -0/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-07-31 | 1 | -0/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-07-31 | 1 | -0/+7 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-23051: riscv64 fails build (atomics) | Daniel Black | 2020-07-28 | 1 | -0/+7 |
* | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-07-02 | 1 | -10/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-07-02 | 1 | -10/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | make rocksdb cmake checks less verbose on repeat | Sergei Golubchik | 2020-07-01 | 1 | -10/+0 |
* | | | | MDEV-21303 Make executables MariaDB named | Rasmus Johansson | 2020-03-21 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-12-27 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-12-27 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Disable -Werror for rocksdb submodule | Sergei Golubchik | 2019-12-17 | 1 | -1/+1 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-07-02 | 1 | -0/+26 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-02 | 1 | -0/+26 |
| |\ \ | | |/ | |||||
| | * | Post-merge build fixes | Sergei Petrunia | 2019-06-16 | 1 | -18/+21 |
| | * | Post-merge fixes: fix linking on Windows | Sergei Petrunia | 2019-06-16 | 1 | -1/+2 |
| | * | Merge from MyRocks upstream: | Sergei Petrunia | 2019-06-16 | 1 | -0/+22 |
| | |\ | |||||
| | | * | Copy of | Sergei Petrunia | 2019-06-15 | 1 | -1/+23 |
* | | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-05-19 | 1 | -0/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-05-17 | 1 | -0/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Issue #904: Crash in rocksdb::IOStatsContext::Reset, this=NULL | Sergei Petrunia | 2019-05-16 | 1 | -0/+5 |
* | | | | remove -fno-rtti | Sergei Golubchik | 2019-05-18 | 1 | -23/+0 |
|/ / / | |||||
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-04-08 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | cmake: don't use generated files to detect a submodule | Sergei Golubchik | 2019-04-07 | 1 | -2/+2 |
* | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-01-03 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | fix RHEL8 "ambiguous python shebang" build failures | Sergei Golubchik | 2019-01-03 | 1 | -1/+3 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 1 | -1/+7 |
|\ \ \ | |/ / | |||||
| * | | Rocksdb, Windows - better fix for broken WIN32_LEAN_AND_MEAN | Vladislav Vaintroub | 2018-09-05 | 1 | -9/+0 |
| * | | MyRocks: post-merge fixes: Make it compile on Windows. | Sergei Petrunia | 2018-08-31 | 1 | -0/+9 |
| * | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2018-08-28 | 1 | -1/+7 |
| |\ \ | | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2018-08-28 | 1 | -6/+17 |
* | | | cmake .git warning | Sergei Golubchik | 2018-08-12 | 1 | -1/+1 |
* | | | MDEV-15578: MyRocks: support zstandard compression where the distro allows it | Vicențiu Ciorbaru | 2018-05-24 | 1 | -0/+7 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-24 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | MDEV-12439: MariaRocks produces numerous (spurious?) valgrind failures | Sergei Petrunia | 2018-05-22 | 1 | -0/+3 |
* | | | Merge branch 'github/10.2' into 10.3 | Sergei Golubchik | 2018-05-22 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-16200: -DPLUGIN_ROCKSDB=YES leads to errors during build | Sergei Petrunia | 2018-05-18 | 1 | -1/+1 |
* | | | Merge pull request #753 from shinnok/10.3-macfixes | Sergei Petrunia | 2018-05-15 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | MDEV-15778: Rocksdb missing linkage to dbug library | Teodor Mircea Ionita | 2018-05-10 | 1 | -1/+1 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 1 | -4/+4 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2 | Sergei Petrunia | 2018-05-07 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | MyRocks: Fix link error on Windows | Sergei Petrunia | 2018-04-17 | 1 | -2/+2 |
| | * | | Merge from merge-myrocks: | Sergei Petrunia | 2018-01-27 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Copy of | Sergei Petrunia | 2018-01-27 | 1 | -11/+10 |
* | | | | Make possible to use clang on Windows (clang-cl) | Vladislav Vaintroub | 2018-02-20 | 1 | -0/+4 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -0/+2 |
|\ \ \ \ | |/ / / |