summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2021-05-101-11/+12
|\
| * Merge 10.2 into 10.3Marko Mäkelä2021-05-101-11/+12
| |\
| | * MDEV-25232 Ninja MSVC build sets default CMAKE_BUILD_TYPE to DebugVladislav Vaintroub2021-05-091-11/+12
| | | | | | | | | | | | | | | | | | | | | This is incosistent with other single config generators, where the default type has always been RelWithDebInfo. Fixed by moving setting of CMAKE_BUILD_TYPE right before PROJECT.
* | | Merge branch bb-10.3-release into bb-10.4-releaseNikita Malyavin2021-05-051-14/+13
|\ \ \ | |/ /
| * | Merge branch bb-10.2-release into bb-10.3-releaseNikita Malyavin2021-05-041-14/+13
| |\ \ | | |/
| | * MDEV-25232 - CMake deprecation warning about CMAKE_MINIMUM_REQUIRED < 2.8.12Vladislav Vaintroub2021-04-281-14/+13
| | |
* | | Merge 10.3 into 10.4bb-10.4-mergeMarko Mäkelä2021-04-251-2/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-04-241-2/+1
| |\ \ | | |/ | | | | | | except commit 1288dfffe77a99d6c5906d12010a1677ee149308
| | * remove EXCEPTIONS-CLIENTSergei Golubchik2021-04-231-2/+1
| | | | | | | | | | | | | | | It's Oracle libmysqlclient license exception, we no longer include, build or ship libmysqlclient
* | | Merge 10.3 into 10.4Marko Mäkelä2021-04-141-2/+2
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-04-141-2/+2
| |\ \ | | |/
| | * -DMYSQL_MAINTAINER_MODE=NOSergei Golubchik2021-04-131-1/+1
| | | | | | | | | | | | | | | also add =WARN as an alias for =OFF and clarify the help text
* | | Merge 10.3 into 10.4Marko Mäkelä2021-03-271-9/+5
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-03-271-9/+5
| |\ \ | | |/
| | * cmake cleanup: drop support for ancient clang in WITH_ASAN optionEugene Kosov2021-03-261-10/+0
| | |
| | * MDEV-25238 add support for -fsanitize-address-use-after-scopeEugene Kosov2021-03-261-0/+6
| | | | | | | | | | | | Use like this: cmake -DWITH_ASAN=ON -DWITH_ASAN_SCOPE=ON
| | * MDEV-24034 Policy CMP0075 is not set during compileVladislav Vaintroub2020-12-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The policy is not set for 10.2 If it is set, CMake would complain about bundled zlib for which the policy is not set. Fix: - Set policy for 10.2 for the top level project. For 10.3+ it was already set - Cleanup zlib to remove unneeded stuff. It is an internal static library, it needs none of PROJECT, library versioning, RC file on Windows. The name of the library on Unix does not make any difference, since it is static and compiled in.
* | | Merge 10.3 into 10.4Marko Mäkelä2020-07-201-1/+2
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-07-201-2/+3
| |\ \ | | |/
| | * Merge 10.1 into 10.2Marko Mäkelä2020-07-201-1/+2
| | |\
| | | * check_linker_flag: use for linker flagsDaniel Black2020-07-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wl,-z,relro,-z,now are linker flags and should be checked as such. TODO: perform module, exe shared checks separately rather than a pure linker check.
* | | | Merge 10.3 into 10.4Marko Mäkelä2020-06-031-0/+3
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2020-06-021-0/+3
| |\ \ \ | | |/ /
| | * | cmake: quieterSergei Golubchik2020-05-311-0/+3
| | | |
| | * | Merge branch '10.1' into 10.2mariadb-10.2.32Oleksandr Byelkin2020-05-081-2/+3
| | |\ \ | | | |/
| | | * MDEV-21437 MariaDB's SUSE/SLES packages don't "provide" all of the same ↵Sergei Golubchik2020-05-051-2/+3
| | | | | | | | | | | | | | | | capabilities as the platform's default packages
* | | | Merge branch '10.3' into 10.4Sergei Golubchik2020-05-091-4/+6
|\ \ \ \ | |/ / /
| * | | MDEV-22123 On RHEL8 mariadb-server is not providedSergei Golubchik2020-05-091-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup alternative name for rhel8/centos8 use correct C/C version when providing mariadb-connector-c and other changes for installation over distro packages to work: dnf install mariadb-server dnf install --allowerasing MariaDB-{server,common,client,shared}*.rpm
* | | | Merge 10.3 into 10.4Marko Mäkelä2020-05-051-1/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-05-041-0/+5
| |\ \ \ | | |/ /
| | * | add WITH_DBUG_TRACE CMake variableEugene Kosov2020-04-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a way do disable DBUG_ENTER()/DBUG_EXIT() stuff which is needed to dbug trace. Those who doesn't need it may avoid tests slowdown with -DWITH_DBUG_TRACE=OFF dbug/tests.c: add define which is neede always in this test innodb.log_file_name_debug.test: do not depend on DBUG trace stuff in test Benchmark results: each test eats less CPU and you can have more parallel jobs in MTR. patched: ./mtr -mem -par=8 -suite=innodb 185.34s user 86.85s system 133% cpu 3:23.27 total ./mtr -mem -par=8 -suite=main 80.96s user 36.01s system 182% cpu 1:04.07 total main.select [ pass ] 1660 main.select [ pass ] 1513 main.select [ pass ] 1543 main.select [ pass ] 1660 main.select [ pass ] 1521 main.select [ pass ] 1511 main.select [ pass ] 1508 main.select [ pass ] 1520 main.select [ pass ] 1514 main.select [ pass ] 1522 vanilla: ./mtr -mem -par=8 -suite=innodb 203.61s user 92.16s system 140% cpu 3:30.16 total ./mtr -mem -par=8 -suite=main 94.11s user 35.51s system 206% cpu 1:02.69 total main.select [ pass ] 2032 main.select [ pass ] 2017 main.select [ pass ] 2040 main.select [ pass ] 2183 main.select [ pass ] 2253 main.select [ pass ] 2075 main.select [ pass ] 2109 main.select [ pass ] 2080 main.select [ pass ] 2098 main.select [ pass ] 2114
* | | | Merge 10.3 into 10.4Marko Mäkelä2020-03-301-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2020-03-301-1/+1
| |\ \ \ | | |/ /
| | * | unoptimized -fsanitize=undefined build on clang requires more stack spaceEugene Kosov2020-03-231-1/+1
| | | |
| | * | Update install layout to account for multi-arch setupDaniel Black2020-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup install_layout to account for multi-arch setup and remove redundant defines in debian rules. Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
* | | | always build wsrep libraries staticSergei Golubchik2019-08-261-7/+4
| | | | | | | | | | | | | | | | even if -DBUILD_SHARED_LIBS=ON was used
* | | | cleanup: SECURITY_HARDENED in CMakeLists.txtSergei Golubchik2019-08-261-22/+9
| | | |
* | | | Merge 10.3 into 10.4, except for MDEV-20265Marko Mäkelä2019-08-231-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The MDEV-20265 commit e746f451d57def4be679caafc29976741b3e89f7 introduces DBUG_ASSERT(right_op == r_tbl) in st_select_lex::add_cross_joined_table(), and that assertion would fail in several tests that exercise joins. That commit was skipped in this merge, and a separate fix of MDEV-20265 will be necessary in 10.4.
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-08-211-1/+6
| |\ \ \ | | |/ /
| | * | MDEV-20377: Introduce cmake -DWITH_MSAN:BOOL=ONMarko Mäkelä2019-08-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MemorySanitizer is a compile-time instrumentation layer in clang and GCC. Together with AddressSanitizer mostly makes the run-time instrumentation of Valgrind redundant. It is a little more tricky to set up, because running with uninstrumented libraries will lead into false positives. You will need an instrumented libc++, and you should use -stdlib=libc++ instead of the default libstdc++. To build the instrumented library, you can refer to https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo or you can adapt these steps that worked for me, for clang-8 version 8.0.1: cd /mariadb sudo apt source libc++-8-dev cd llvm-toolchain-8-8.0.1 mkdir libc++msan; cd libc++msan cmake ../libcxx -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_SANITIZER=Memory \ -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 Then, in your MariaDB build directory, you have to compile with libc++ and bundled libraries, such as WITH_SSL=bundled, WITH_ZLIB=bundled. For uninstrumented system libraries, you will get false positives for uninitialized values. Like this: cmake -DWITH_MSAN=ON -DWITH_SSL=bundled -DWITH_ZLIB=bundled \ -DCMAKE_CXX_FLAGS='-stdlib=libc++' .. Note: you should also add -O2 to the compiler options, or you may get crashes due to stack overflow. Finally, to run tests, you must replace libc++ with the instrumented one: LD_LIBRARY_PATH=/mariadb/llvm-toolchain-8-8.0.1/libc++msan/lib \ MSAN_OPTIONS=abort_on_error=1 \ ./mtr --big-test --parallel=auto --force --retry=0 Failure to do so will report numerous false positives related to operations on std::string and the like. This is work in progress. Some issues will still have to be fixed for WITH_MSAN to be usable. See MDEV-20377 for details.
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-07-251-0/+3
|\ \ \ \ | |/ / /
| * | | cmake 3.14.3 warningsSergei Golubchik2019-07-121-0/+3
| | | |
* | | | MDEV-17592 Create MariaDB named commands/symlinksRasmus Johansson2019-06-171-0/+1
| | | |
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-06-141-5/+7
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-06-141-5/+7
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2019-06-121-5/+7
| | |\ \ | | | |/
| | | * MDEV-19360 - Disable _FORTIFY_SOURCE for ASAN buildsSergey Vojtovich2019-06-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those two may work incorrectly together. Namely, ASAN may produce false positives or false negatives. For details see https://github.com/google/sanitizers/wiki/AddressSanitizer#faq Make SECURITY_HARDENED disabled by default if WITH_ASAN=ON Based on contribution by Eugene Kosov.
* | | | MDEV-18531 : Use WolfSSL instead of YaSSL as "bundled" SSL/encryption libraryVladislav Vaintroub2019-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new submodule for WolfSSL - Build and use wolfssl and wolfcrypt instead of yassl/taocrypt - Use HAVE_WOLFSSL instead of HAVE_YASSL - Increase MY_AES_CTX_SIZE, to avoid compile time asserts in my_crypt.cc (sizeof(EVP_CIPHER_CTX) is larger on WolfSSL)
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-191-2/+12
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
| |\ \ \ | | |/ /
View Lorry Controller Status