summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Fix PCRE2 build for Windows, with Ninja and Makefiles generator.Vladislav Vaintroub2019-12-251-5/+12
| | | | | Also, suppress pcre2 warning, it is external project, its warnings should not bother us.
* remove pcre, add support for bundled pcre2Sergei Golubchik2019-12-211-5/+43
|
* MDEV-14024 PCRE2.Alexey Botchkov2019-12-211-15/+8
| | | | Related changes in the server code.
* Merge 10.4 into 10.5Aleksey Midenkov2019-12-021-3/+5
|\
| * Merge 10.3 into 10.4Aleksey Midenkov2019-12-021-3/+5
| |\
| | * RPM packaging fixes for FC31Sergei Golubchik2019-11-281-3/+5
| | | | | | | | | | | | | | | | | | Obsoletes: cannot contain (x86-64) anymore Python shebang must be specific
* | | Merge branch '10.4' into 10.5Vladislav Vaintroub2019-11-271-0/+4
|\ \ \ | |/ / | | | | | | | | | # Conflicts: # win/packaging/extra.wxs.in
| * | MDEV-19781 fixupsVladislav Vaintroub2019-11-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It is not enough to have and DeleteSymlinks actions because within the same installation some exes executables can be both added and removed, which needs both adding and removing some symlinks. Instead of CreateSymlinks, there is now FixSymlinks function, which goes through the list, and adds or removes the symlinks as needed. - Implemented rollback for symlink custom action. - Generate list of symlinks in C++ file, using CMake, rather than storing lists as MSI properties.
* | | Merge 10.4 into 10.5Oleksandr Byelkin2019-11-071-1/+1
|\ \ \ | |/ /
| * | Merge 10.3 into 10.4Marko Mäkelä2019-11-011-1/+1
| |\ \ | | |/
| | * Fix clang-cl build on WindowsVladislav Vaintroub2019-10-301-1/+1
| | |
* | | Part2: MDEV-20837 Add MariaDB_FUNCTION_PLUGINAlexander Barkov2019-10-161-1/+0
| | | | | | | | | | | | Removing MariaDB_FUNCTION_COLLECTION_PLUGIN
* | | Part1: MDEV-20837 Add MariaDB_FUNCTION_PLUGINAlexander Barkov2019-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | | - Defining MariaDB_FUNCTION_PLUGIN - Changing the code in /plugins/type_inet/ and /plugins/type_test/ to use MariaDB_FUNCTION_PLUGIN instead of MariaDB_FUNCTION_COLLECTION_PLUGIN. - Changing maturity for the INET6 data type plugin from experimental to alpha.
* | | MDEV-20764 Add MariaDB_FUNCTION_COLLECTION_PLUGINAlexander Barkov2019-10-071-0/+1
| | |
* | | MDEV-20016 Add MariaDB_DATA_TYPE_PLUGINAlexander Barkov2019-10-041-0/+1
| | |
* | | Merge 10.4 into 10.5Marko Mäkelä2019-09-251-2/+2
|\ \ \ | |/ /
| * | Merge 10.3 into 10.4Marko Mäkelä2019-09-251-2/+2
| |\ \ | | |/
| | * Merge remote-tracking branch 'origin/10.2' into 10.3Alexander Barkov2019-09-241-2/+2
| | |\
| | | * Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2019-09-241-2/+2
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.5' into 10.1Alexander Barkov2019-09-241-2/+2
| | | | |\
| | | | | * MDEV-20596 Configure fails with newer CMakeRyan Coe2019-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build error with newer cmake Fixes the following build error: CMake Error at cmake/os/Linux.cmake:29 (STRING): STRING sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): CMakeLists.txt:101 (INCLUDE) CMake Error at cmake/os/Linux.cmake:29 (STRING): STRING sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): CMakeLists.txt:101 (INCLUDE) The error happens when CMAKE_SHARED_LINKER_{LANG}_FLAGS is not set. Force the variable to be set to "" as input to prevent this. Signed-off-by: Ryan Coe <bluemrp9@gmail.com> Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-09-242-4/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-09-231-2/+20
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Disable MDEV-20576 assertions until MDEV-20595 has been fixed.
| | * | | | Merge 10.2 into 10.3Marko Mäkelä2019-09-231-2/+20
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-20570 : Packaging fails "The specified timestamp server either could ↵Vladislav Vaintroub2019-09-121-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not be reached" On Windows, during packaging step, if signing fails, retry signtool again without timestamp parameter. Fixes sporadic (rare) failures on buildbot
| * | | | | cmake: support new libedit interfaceSebastian Kemper2019-09-201-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libedit changed it's interface a while ago. MariaDB's cmake file doesn't recognize the new interface, the compile test fails: /mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx: In function 'int main(int, char**)': /mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx:6:47: error: invalid conversion from 'char*' to 'int' [-fpermissive] int res= (*rl_completion_entry_function)(0,0); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ Fix this by adding a detection for the new interface as well. Run-tested on a MIPS machine. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-09-121-0/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-09-121-0/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.2 into 10.3Marko Mäkelä2019-09-101-0/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-20542 Windows enable/d2OptimizeHugeFunctionsVladislav Vaintroub2019-09-091-0/+2
| | | | | |
| | | * | | On Windows, treat linker warnings as errors, ifVladislav Vaintroub2019-09-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | MYSQL_MAINTAINER_MODE is ERR
* | | | | | Merge remote-tracking branch 'origin/10.4' into 10.5Alexander Barkov2019-09-111-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.3' into 10.4Sergei Golubchik2019-09-061-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-09-061-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | use a shorter name for sources in debuginfo rpmsSergei Golubchik2019-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | have the same path as in source rpms, don't build them differently
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-09-065-7/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-08-312-1/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.2 into 10.3Marko Mäkelä2019-08-292-1/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.1 into 10.2Marko Mäkelä2019-08-282-1/+3
| | | |\ \ \ | | | | |/ /
| | | | * | ensure that pam plugin is present in release packagesSergei Golubchik2019-08-201-0/+1
| | | | | |
| | | | * | really make CPACK_RPM_DEBUGINFO_PACKAGE configurableSergei Golubchik2019-08-201-1/+2
| | | | | |
| * | | | | always build wsrep libraries staticSergei Golubchik2019-08-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | even if -DBUILD_SHARED_LIBS=ON was used
| * | | | | Merge 10.3 into 10.4, except for MDEV-20265Marko Mäkelä2019-08-232-6/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-20377: Introduce cmake -DWITH_MSAN:BOOL=ONMarko Mäkelä2019-08-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | MDEV-19740 Debug build of 10.3.15 FTBFSAleksey Midenkov2019-08-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace LINT_INIT for non-struct types with ctor initializers; * Check BUILD_DEPS list is not empty so REMOVE_DUPLICATES won't throw error.
* | | | | | compilation fix for cmake 2.18Sergei Golubchik2019-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | cmake that old doesn't support VERSION_GREATER_EQUAL
* | | | | | Removed some compiler warnings found by clangMonty2019-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some unitialized variables - Removed some warnings: -Wno-parentheses-equality gives warnings from macro-expressions -Wno-string-plus-int is not a common problem and it's not trivial to fix it in connect
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-08-136-31/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-07-254-27/+23
| |\ \ \ \ \ | | |/ / / /