summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 10.8 into 10.9Daniel Black2022-04-061-0/+2
|\ | | | | | | Closes #2084
| * Merge branch 10.7 into 10.8Daniel Black2022-04-061-0/+2
| |\ | | | | | | | | | Closes #2083
| | * MDBF-348: libfmt=system, custom include pathDaniel Black2022-04-011-0/+2
| | | | | | | | | | | | | | | | | | With testing the system libfmt, use the LIBFMT_INCLUDE_DIR in case the system include path isn't sufficient.
* | | Merge 10.8 into 10.9Marko Mäkelä2022-03-301-13/+22
|\ \ \ | |/ /
| * | Merge 10.7 into 10.8Marko Mäkelä2022-03-301-13/+22
| |\ \ | | |/
| | * Merge 10.6 into 10.7Marko Mäkelä2022-03-301-13/+22
| | |\
| | | * Merge 10.5 into 10.6Marko Mäkelä2022-03-291-13/+22
| | | |\
| | | | * Merge 10.4 into 10.5Marko Mäkelä2022-03-291-13/+22
| | | | |\
| | | | | * Merge 10.3 into 10.4Marko Mäkelä2022-03-291-13/+22
| | | | | |\
| | | | | | * MDEV-28032 "git submodule update --depth 1" may fail with old GitSutou Kouhei2022-03-191-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodules.cmake: don't use "--depth 1" with old Git Old Git may not work with "--depth 1" when the referenced commit hash is far from HEAD. Newer Git improves the situation. For example: https://github.com/git/git/commit/fb43e31f2b43076e7a30c9cd00d0241cb8cf97eb It's safe to not use "--depth 1" with old Git. Closes #2049
* | | | | | | Small fixesJan Lindström2022-03-181-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new requirement for pv tool for debian and rpm Fix one test result difference. Set message about missing progress reporting tool pv as info.
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-02-141-0/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-02-141-0/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-02-141-0/+12
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-27813 Windows, compiling : RelWithDebInfo should use /Ob2Vladislav Vaintroub2022-02-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed inlining flags. Remove /Ob1 added by CMake for RelWithDebInfo. (the actual compiler default is /Ob2 if optimizations are enabled) Allow to define custom /Ob flag with new variable MSVC_INLINE, if desired
* | | | | | make zstd in C/C optional and disable it for now in RPM/DEBSergei Golubchik2022-02-051-0/+2
| | | | | |
* | | | | | Revert "don't build with OpenSSL 3.0, it doesn't work before MDEV-25785"Oleksandr Byelkin2022-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c9beef43154a199bfcd9f71049c011a2ed77ca74, because we have OpenSSL 3.0 support here.
* | | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2022-02-045-7/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-02-045-7/+37
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-02-035-7/+36
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.4' into 10.5Oleksandr Byelkin2022-02-014-3/+22
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-01-304-3/+22
| | | | |\ \ | | | | | |/
| | | | | * Merge branch '10.2' into 10.3mariadb-10.3.33Oleksandr Byelkin2022-01-293-2/+15
| | | | | |\
| | | | | | * don't build with OpenSSL 3.0, it doesn't work before MDEV-25785Sergei Golubchik2022-01-211-1/+1
| | | | | | |
| | | | | | * MDEV-27109 mysql_config mariadb_config lists non existant -lmariadbAlexey Bychko2022-01-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added dependency devel->shared and conflict with previous versions update C/C 3.1 with the corresponding C/C part of the fix
| | | | | | * /usr/lib64/pkgconfig is not owned by MariaDB-develSergei Golubchik2022-01-141-0/+1
| | | | | | |
| | | | | | * MDEV-14938 make buildbot to include galera into bintarsSergei Golubchik2022-01-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | allow injecting extra files into the bintar
| | | | | | * MDEV-27364 Build from 10.2-10.4 srpm fails on RHEL8 family due to ↵Sergei Golubchik2021-12-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discrepancy in jemalloc requirements pass jemalloc requirement down to srpm build
| | | | | * | Updated comment in systemd.cmakeMonty2022-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested by serg@mariadb.org
| | | | | * | MDEV-26317: Add SYSTEMD_READWRITEPATH variable to mariadb.service.in-fileTuukka Pasanen2022-01-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SYSTEMD_READWRITEPATH-variable to mariadb{@,}.service.in to make sure that if one is not building RPM or DEB packages then make sure there is ReadWritePaths directive is defined in systemd service file. This ensures that tar-ball installation has permissions to write database default installation path (default: /usr/local/mysql/data) even if it's located under /usr. Writing to that location is prevented by 'ProtectSystem=full' systemd directive by default. Prefixing the path with "-" in systemd causes there to not be an error if the path doesn't exist. This may occur if the user has configured a datadir elsewhere. Reviewer: Daniel Black
| | | * | | | pass MYSQL_MAINTAINER_MODE down to srpm buildsSergei Golubchik2022-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes errors on rpm-*-debug builder
| | | * | | | new pcre fixup - they renamed static libraries, again.Vladislav Vaintroub2022-01-271-2/+11
| | | | | | |
| | | * | | | new pcre 10.39Oleksandr Byelkin2022-01-271-4/+4
| | | | | | |
| | * | | | | pass MYSQL_MAINTAINER_MODE down to srpm buildsSergei Golubchik2022-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes errors on rpm-*-debug builder
* | | | | | | MDEV-27540 Different OpenSSL versions mix up in build depending on cmake optionspreview-10.8-MDEV-25785-openssl3.0Sergei Golubchik2022-01-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list ${OPENSSL_ROOT_DIR}/lib64 explicitly, because cmake below version 3.23.0 won't search there.
* | | | | | | MDEV-25785 Add support for OpenSSL 3.0Vladislav Vaintroub2022-01-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary of changes - MD_CTX_SIZE is increased - EVP_CIPHER_CTX_buf_noconst(ctx) does not work anymore, points to nobody knows where. The assumption made previously was that (since the function does not seem to be documented) was that it points to the last partial source block. Add own partial block buffer for NOPAD encryption instead - SECLEVEL in CipherString in openssl.cnf had been downgraded to 0, from 1, to make TLSv1.0 and TLSv1.1 possible (according to https://github.com/openssl/openssl/blob/openssl-3.0.0/NEWS.md even though the manual for SSL_CTX_get_security_level claims that it should not be necessary) - Workaround Ssl_cipher_list issue, it now returns TLSv1.3 ciphers, in addition to what was set in --ssl-cipher - ctx_buf buffer now must be aligned to 16 bytes with openssl( previously with WolfSSL only), ot crashes will happen - updated aes-t , to be better debuggable using function, rather than a huge multiline macro added test that does "nopad" encryption piece-wise, to test replacement of EVP_CIPHER_CTX_buf_noconst
* | | | | | | Merge branch 'preview-10.8-MDEV-26713-Windows-i18-support' into 10.8bb-10.8-wladVladislav Vaintroub2022-01-182-2/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | MDEV-26713 Set activeCodePage=UTF8 for windows programsVladislav Vaintroub2021-12-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use corresponding entry in the manifest, as described in https://docs.microsoft.com/en-us/windows/apps/design/globalizing/use-utf8-code-page - If if ANSI codepage is UTF8 (i.e for Windows 1903 and later) Use UTF8 as default client charset Set console codepage(s) to UTF8, in case process is using console - Allow some previously disabled MTR tests, that used Unicode for in "exec", for the recent Windows versions
| * | | | | | MDEV-27092 Windows - services that have non-ASCII characters do not work ↵Vladislav Vaintroub2021-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with activeCodePage=UTF8 CreateServiceA, OpenServiceA, and couple of other functions do not work correctly with non-ASCII character, in the special case where application has defined activeCodePage=UTF8. Workaround by redefining affected ANSI functions to own wrapper, which works by converting narrow(ANSI) to wide, then calling wide function. Deprecate original ANSI service functions, via declspec, so that we can catch their use.
* | | | | | | Merge 10.6 into 10.7Marko Mäkelä2022-01-121-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge 10.5 into 10.6Marko Mäkelä2022-01-121-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Silence CMake warning from exteral cmake project (pcre2)st-10.5-wladVladislav Vaintroub2022-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The warning reads: CMake Deprecation Warning at CMakeLists.txt:101 (CMAKE_MINIMUM_REQUIRED): Compatibility with CMake < 2.8.12 will be removed from a future version of CMake.
* | | | | | Merge branch '10.6' into 10.7Sergei Golubchik2021-12-082-4/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.5' into 10.6Sergei Golubchik2021-12-072-4/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | require system pcre2 in rpmsSergei Golubchik2021-12-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | now when SLES12.3 is gone, we can enforce it
| | * | | | Merge branch '10.4' into 10.5Sergei Golubchik2021-12-071-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.3' into 10.4Sergei Golubchik2021-12-071-1/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '10.2' into 10.3Sergei Golubchik2021-12-061-1/+2
| | | | |\ \ | | | | | |/
| | | | | * fix srpm builds after fe065f8d90b0Sergei Golubchik2021-12-061-1/+2
| | | | | |
* | | | | | cmake: detect lz4 version, require >= 1.6Sergei Golubchik2021-12-081-2/+10
| | | | | |