summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2022-09-201-3/+3
|\
| * Merge 10.3 into 10.4Marko Mäkelä2022-09-201-3/+3
| |\
| | * mysql_release: treat alma|rocky as centos|rhelSergei Golubchik2022-09-131-2/+2
| | |
| * | Merge 10.3 into 10.4Marko Mäkelä2022-09-131-1/+1
| |\ \ | | |/
| | * MDEV-29522 RocksDB RPM doesn't get built on Rocky Linux and AlmaSergei Golubchik2022-09-131-1/+1
| | | | | | | | | | | | use correct python on rocky8 and alma8
* | | Merge branch 10.4 into 10.5Daniel Black2022-08-311-0/+5
|\ \ \ | |/ /
| * | Merge 10.3 into 10.4Daniel Black2022-08-311-0/+5
| |\ \ | | |/
| | * MDEV-28592 disks plugin - getmntinfo (BSD) & getmntent (AIX)Daniel Black2022-08-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to references from Brad Smith, BSDs use getmntinfo as a system call for mounted filesystems. Most BSDs return statfs structures, (and we use OSX's statfs64), but NetBSD uses a statvfs structure. Simplify Linux getmntent_r to just use getmntent. AIX uses getmntent. An attempt at writing Solaris compatibility with a small bit of HPUX compatibility was made based on man page entries only. Fixes welcome. statvfs structures now use f_bsize for consistency with statfs Test case adjusted as PATH_MAX is OS defined (e.g. 1023 on AIX) Fixes: 0ee5cf837e3a0464acc20db2a2aee0adaff3f2ac also fixes: MDEV-27818: Disk plugin does not show zpool mounted devices This is because zpool mounted point don't begin with /. Due to the proliferation of multiple filesystem types since this was written, we restrict the entries listed in the disks plugin to excude: * read only mount points (no point monitoring, and includes squash, snaps, sysfs, procfs, cgroups...) * mount points that aren't directories (excludes /etc/hostname and similar mounts in containers). (getmntent (Linux/AIX) only) * exclude systems where there is no capacity listed (excludes various virtual filesystem types). Reviewer: Sergei Golubchik
* | | Merge 10.4 into 10.5Marko Mäkelä2022-08-221-16/+0
|\ \ \ | |/ /
| * | Merge 10.3 into 10.4Marko Mäkelä2022-08-221-16/+0
| |\ \ | | |/
| | * Remove Darwin CMake fileBrad Smith2022-08-101-16/+0
| | | | | | | | | | | | The file is now empty and thus serves no purpose.
* | | Merge branch '10.4' into 10.5mariadb-10.5.17Oleksandr Byelkin2022-08-105-5/+5
|\ \ \ | |/ /
| * | Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26Oleksandr Byelkin2022-08-105-5/+5
| |\ \ | | |/
| | * Fix typos in the codebase.fluesvamp2022-08-095-5/+5
| | |
* | | MDEV-29220 Missing RHEL-9-specific logic in cpack_rpm.cmakeSergei Golubchik2022-08-031-1/+1
| | |
* | | MDEV-27540 Different OpenSSL versions mix up in build depending on cmake optionsSergei Golubchik2022-08-021-1/+2
| | | | | | | | | | | | | | | list ${OPENSSL_ROOT_DIR}/lib64 explicitly, because cmake below version 3.23.0 won't search there.
* | | Merge 10.4 into 10.5Marko Mäkelä2022-07-273-27/+5
|\ \ \ | |/ /
| * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-07-273-27/+5
| |\ \ | | |/
| | * Windows - reduce irrelevant CMake system checksVladislav Vaintroub2022-07-181-0/+5
| | |
| | * MDEV-27686 Moving libexecinfo out of FreeBSD / OpenBSD specific CMake codeVladislav Vaintroub2022-07-172-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | On all Unix platforms, link libexecinfo as system library, if it contains backtrace_symbols_fd function, and libc does not contain this function Also remove cmake/os/OpenBSD.cmake, as after the fix it serves no purpose.
* | | Revert "don't build with OpenSSL 3.0, it doesn't work before MDEV-25785"Oleksandr Byelkin2022-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit c9beef43154a199bfcd9f71049c011a2ed77ca74, because we have OpenSSL 3.0 support here. part of MDEV-29000
* | | MDEV-25785 Add support for OpenSSL 3.0Vladislav Vaintroub2022-07-041-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 part of MDEV-29000
* | | Merge branch '10.4' into 10.5mariadb-10.5.16Sergei Golubchik2022-05-181-0/+2
|\ \ \ | |/ /
| * | enable -Wenum-compare -Wenum-conversionSergei Golubchik2022-05-151-0/+2
| | | | | | | | | | | | | | | to make the all headers -std=c++20 clean for those, who need c++20 (some plugins)
* | | New PCRE2 (10.40)Oleksandr Byelkin2022-04-271-2/+3
| | |
* | | 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
* | | 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
* | | 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
| | | |
* | | | 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.
* | | | 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
| | | |
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-11-292-45/+19
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-11-292-45/+19
| |\ \ \ | | |/ /
View Lorry Controller Status