summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.3' into 10.4Sergei Golubchik2020-05-092-4/+35
|\
| * Merge branch '10.2' into 10.3mariadb-10.3.23Sergei Golubchik2020-05-091-0/+8
| |\
| | * Merge branch '10.1' into 10.2mariadb-10.2.32Oleksandr Byelkin2020-05-081-0/+8
| | |\
| | | * MDEV-21437 MariaDB's SUSE/SLES packages don't "provide" all of the same ↵Sergei Golubchik2020-05-051-0/+8
| | | | | | | | | | | | | | | | capabilities as the platform's default packages
| * | | MDEV-22123 On RHEL8 mariadb-server is not providedSergei Golubchik2020-05-092-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-04-291-0/+4
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2020-04-281-0/+4
| |\ \ \ | | |/ /
| | * | MDEV-21913 Add pam_user_map.so file to binary tarball packageSergei Golubchik2020-04-281-0/+4
| | | |
| | * | Merge 10.1 into 10.2Marko Mäkelä2020-04-271-7/+3
| | |\ \ | | | |/
| | | * MDEV-22078 MariaDB-compat missing from MariaDB 10.4 CentOS 8 Yum RepoSergei Golubchik2020-04-271-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport INSALL_SYMLINK cmake macro from 10.3. It'll make libmysqlclient_r.* symlinks to link to the actual shared library file, not to another symlink. As a bonus it'll fix cmake warning about deprecated LOCATION property
* | | | Merge 10.3 into 10.4Marko Mäkelä2020-04-161-3/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | In main.index_merge_myisam we remove the test that was added in commit a2d24def8cc42d27c72d833abfb39ef24a2b96ba because it duplicates the test case that was added in commit 5af12e463549e4bbc2ce6ab720d78937d5e5db4e.
| * | | Merge 10.2 into 10.3Marko Mäkelä2020-04-151-3/+9
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2020-04-141-3/+9
| | |\ \ | | | |/
| | | * MDEV-19740: Have MYSQL_MAINTAINER_MODE only enable -WerrorMarko Mäkelä2020-04-011-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let us enable all GCC and clang warnings independently of the MYSQL_MAINTAINER_MODE setting for both Debug and RelWithDebInfo builds, and have MYSQL_MAINTAINER_MODE only enable -Werror. The default setting of MYSQL_MAINTAINER_MODE=AUTO will continue to apply the -Werror only to CMAKE_BUILD_TYPE=Debug. To build a debug version without -Werror, MYSQL_MAINTAINER_MODE=OFF can be used.
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-03-111-7/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2020-03-081-7/+3
| |\ \ \ | | |/ /
| | * | Update install layout to account for multi-arch setupDaniel Black2020-03-081-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge commit '10.3' into 10.4Oleksandr Byelkin2020-03-115-91/+4
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-03-062-0/+2
| |\ \ \ | | |/ /
| | * | MENT-606 Error while setting value 'aes_ctr' to ↵Alexey Bychko2020-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'file-key-management-encryption-algorithm' cmake cannot detect openssl headers on Mac during checks. the solution is to add path to openssl includes to CMAKE_REQUIRED_INCLUDES before checks.
| | * | Clean wrong cherry-pick from previous commitAnel Husakovic2020-02-201-1/+0
| | | | | | | | | | | | | | | | | | | | - Delete variable HAVE_PTHREAD_CONDATTR_SETCLOCK and check - Delete second HAVE_PTHREAD_KEY_DELETE
| | * | my_getncpus based on threads availableDaniel Black2020-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detecting the cpus based on sysconf of the online CPUs can significantly over estimate the number of cpus available. Wheither via numactl, cgroups, taskset, systemd constraints, docker containers and probably other mechanisms, the number of threads mysqld can be run on can be quite less. As such we use the pthread_getaffinity_np function on Linux and FreeBSD (identical API) to get the number of CPUs. The number of CPUs is the default for the thread_pool_size and a too high default will resulting in large memory usage and high context switching overhead. Closes PR #922
| * | | MDEV-16662: cmake remove empty INSTALL_DEBUG_TARGETDaniel Black2020-02-252-88/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No adverse effects since this was made a null function in 6b53f9d781cc19cbec96c3eb048e6407021685a2. This function had the last remaining cmake CMP0026 violation.
| * | | MDEV-16662: cmake: CMP0026 compatible for dtraceDaniel Black2020-02-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake enabling -DENABLE_DTRACE=ON is particularlly noisy with CMP0026 errors. Fixed in the same way as 6b53f9d781cc19cbec96c3eb048e6407021685a2
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-02-112-1/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-02-102-1/+3
| |\ \ \ | | |/ /
| | * | Ignore /lib64 for rpmAnel Husakovic2020-02-101-0/+2
| | | |
| | * | MDEV-21656: Wrong directory for pam_user_map.soAurélien LEQUOY2020-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | JIRA:https://jira.mariadb.org/browse/MDEV-17292 Closes #1443
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-01-242-13/+22
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-242-13/+22
| |\ \ \ | | |/ /
| | * | MDEV-17292 Package the pam_user_map moduleSergei Golubchik2020-01-212-0/+9
| | | |
| | * | cleanup: simplify install_layout.cmakeSergei Golubchik2020-01-211-13/+13
| | | |
| | * | MDEV-21082: isnan/isinf compilation errors, isfinite warnings on MacOSVlad Lesin2019-11-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix consists of three commits backported from 10.3: 1) Cleanup isnan() portability checks (cherry picked from commit 7ffd7fe9627d1f750a3712aebb4503e5ae8aea8e) 2) Cleanup isinf() portability checks Original problem reported by Wlad: re-compilation of 10.3 on top of 10.2 build would cache undefined HAVE_ISINF from 10.2, whereas it is expected to be 1 in 10.3. std::isinf() seem to be available on all supported platforms. (cherry picked from commit bc469a0bdf85400f7a63834f5b7af1a513dcdec9) 3) Use std::isfinite in C++ code This is addition to parent revision fixing build failures. (cherry picked from commit 54999f4e75f42baca484ae436b382ca8817df1dd)
* | | | 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
* | | | 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.3 into 10.4Marko Mäkelä2019-11-011-1/+1
|\ \ \ \ | |/ / /
| * | | Fix clang-cl build on WindowsVladislav Vaintroub2019-10-301-1/+1
| | | |
* | | | 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.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.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
| | | | |
View Lorry Controller Status