summaryrefslogtreecommitdiff
path: root/storage/rocksdb/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2020-09-041-0/+3
|\
| * Merge 10.3 into 10.4Marko Mäkelä2020-09-041-0/+3
| |\
| | * Merge 10.2 into 10.3Marko Mäkelä2020-09-041-0/+3
| | |\
| | | * Fix a typo in the previous csetSergei Petrunia2020-09-041-1/+1
| | | * MDEV-23661: RocksDB produces "missing initializer for member" warningsSergei Petrunia2020-09-031-0/+3
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-08-011-0/+7
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-07-311-0/+7
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2020-07-311-0/+7
| | |\ \ | | | |/
| | | * MDEV-23051: riscv64 fails build (atomics)Daniel Black2020-07-281-0/+7
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-07-021-10/+0
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-07-021-10/+0
| |\ \ \ | | |/ /
| | * | make rocksdb cmake checks less verbose on repeatSergei Golubchik2020-07-011-10/+0
* | | | MDEV-21303 Make executables MariaDB namedRasmus Johansson2020-03-211-3/+3
|/ / /
* | | Merge 10.3 into 10.4Marko Mäkelä2019-12-271-0/+2
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-12-271-1/+1
| |\ \ | | |/
| | * Disable -Werror for rocksdb submoduleSergei Golubchik2019-12-171-1/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2019-07-021-0/+26
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-07-021-0/+26
| |\ \ | | |/
| | * Post-merge build fixesSergei Petrunia2019-06-161-18/+21
| | * Post-merge fixes: fix linking on WindowsSergei Petrunia2019-06-161-1/+2
| | * Merge from MyRocks upstream:Sergei Petrunia2019-06-161-0/+22
| | |\
| | | * Copy ofSergei Petrunia2019-06-151-1/+23
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-191-0/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Sergei Golubchik2019-05-171-0/+5
| |\ \ \ | | |/ /
| | * | Issue #904: Crash in rocksdb::IOStatsContext::Reset, this=NULLSergei Petrunia2019-05-161-0/+5
* | | | remove -fno-rttiSergei Golubchik2019-05-181-23/+0
|/ / /
* | | Merge 10.2 into 10.3Marko Mäkelä2019-04-081-2/+2
|\ \ \ | |/ /
| * | cmake: don't use generated files to detect a submoduleSergei Golubchik2019-04-071-2/+2
* | | Merge branch '10.2' into 10.3Sergei Golubchik2019-01-031-1/+3
|\ \ \ | |/ /
| * | fix RHEL8 "ambiguous python shebang" build failuresSergei Golubchik2019-01-031-1/+3
* | | Merge 10.2 into 10.3Marko Mäkelä2018-09-061-1/+7
|\ \ \ | |/ /
| * | Rocksdb, Windows - better fix for broken WIN32_LEAN_AND_MEANVladislav Vaintroub2018-09-051-9/+0
| * | MyRocks: post-merge fixes: Make it compile on Windows.Sergei Petrunia2018-08-311-0/+9
| * | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma...Sergei Petrunia2018-08-281-1/+7
| |\ \ | | |/
| | * Copy ofSergei Petrunia2018-08-281-6/+17
* | | cmake .git warningSergei Golubchik2018-08-121-1/+1
* | | MDEV-15578: MyRocks: support zstandard compression where the distro allows itVicențiu Ciorbaru2018-05-241-0/+7
* | | Merge 10.2 into 10.3Marko Mäkelä2018-05-241-0/+3
|\ \ \ | |/ /
| * | MDEV-12439: MariaRocks produces numerous (spurious?) valgrind failuresSergei Petrunia2018-05-221-0/+3
* | | Merge branch 'github/10.2' into 10.3Sergei Golubchik2018-05-221-1/+1
|\ \ \ | |/ /
| * | MDEV-16200: -DPLUGIN_ROCKSDB=YES leads to errors during buildSergei Petrunia2018-05-181-1/+1
* | | Merge pull request #753 from shinnok/10.3-macfixesSergei Petrunia2018-05-151-1/+1
|\ \ \
| * | | MDEV-15778: Rocksdb missing linkage to dbug libraryTeodor Mircea Ionita2018-05-101-1/+1
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-05-121-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2Sergei Petrunia2018-05-071-4/+4
| |\ \
| | * | MyRocks: Fix link error on WindowsSergei Petrunia2018-04-171-2/+2
| | * | Merge from merge-myrocks:Sergei Petrunia2018-01-271-2/+2
| | |\ \ | | | |/
| | | * Copy ofSergei Petrunia2018-01-271-11/+10
* | | | Make possible to use clang on Windows (clang-cl)Vladislav Vaintroub2018-02-201-0/+4
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-0/+2
|\ \ \ \ | |/ / /