summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken cmake -DBUILD_CONFIG=mysql_release on Windows.mariadb-10.1.20Vladislav Vaintroub2016-12-141-1/+2
| | | | | mysql_release.cmake set WITH_JEMALLOC=static, which makes windows builds fail since there is no jemalloc either static or shared there
* MDEV-10954: MariaDB Galera: wsrep_sst_common: line 120: which: command not foundNirbhay Choubey2016-12-121-1/+1
| | | | Add 'which' to REQUIRES list.
* Merge branch '10.0' into 10.1Sergei Golubchik2016-12-113-1/+3
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-12-093-1/+3
| |\
| | * MDEV-10293 'setupterm' was not declared in this scopeSergei Golubchik2016-12-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for readline before checking for curses headers, because MYSQL_CHECK_READLINE fails when curses is not found, but CHECK_INCLUDE_FILES simply remembers the fact and continues. So if there's no curses, MYSQL_CHECK_READLINE will abort, the user will then installs curses and continue the build. Thus, CHECK_INCLUDE_HEADERS will remember that there is no curses, but other checks from MYSQL_CHECK_READLINE will remember that curses are there. It will result in inconsistent HAVE_xxx defines.
| | * VS2015 build fixesVladislav Vaintroub2016-10-272-1/+2
| | | | | | | | | | | | | | | | | | - new location of signtool - silence a nonsensical warning from stl header (complain about noexcept() function attribute, if /EHsc is not set)
* | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-0/+4
|\ \ \
| * \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-282-0/+7
| |\ \ \ | | |/ /
| | * | Upstream MIPS 32bit-build-on-64bit patch from Debian Bug#838914Kristian Nielsen2016-10-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838914 Fixes CMake so that when building a 32-bit mips binary on a 64-bit mips machine, the target is not set as 32-bit, which apparently confused some tests in mroonga.
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Attempt to fix strange rpm dependency issue following prior patchKristian Nielsen2016-09-101-0/+3
| | | |
* | | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-251-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Update WSREP_PATCH_REVNO.Nirbhay Choubey2016-08-211-1/+1
| | | |
| * | | Bump WSREP_PATCH_VERSION to 16Philip Stoev2016-08-211-1/+1
| | | |
| * | | Bump WSREP_PATCH_VERSION to 14Philip Stoev2016-08-211-1/+1
| | | |
| * | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-292-3/+6
| |\ \ \ | | |/ /
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-3/+3
|\ \ \ \ | | |/ / | |/| |
* | | | MDEV-10086 no gssapi-server RPM package anymore in 10.1Sergei Golubchik2016-06-281-1/+2
| | | | | | | | | | | | | | | | set CPACK_COMPONENTS_ALL both on the current and parent scope
* | | | MDEV-10004: Galera's pc.recovery process fails in 10.1 with systemdNirbhay Choubey2016-06-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Galera recovery process works in two phases. In the first phase, mysqld is started as non-daemon with --wsrep-recover to recover and fetch the last logged global transaction ID. This ID is then used in second phase as the start position (--wsrep-start-position=XX) to start mysqld as daemon. As this process was implemented in mysqld_safe script, the recovery did not work when server was started using systemd. Fixed by introducing a shell script (wsrep_recovery.sh) that mimics the first phase of the recovery process.
* | | | fix rpm installation issues on FedorasSergei Golubchik2016-05-051-0/+2
| | | |
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-3/+5
|\ \ \ \ | |/ / /
| * | | MDEV-9869 INSTALL SONAME 'ha_connect'Sergei Golubchik2016-04-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | make storage engine RPMs require the exact server version RPM: "MariaDB = %{version}-%{release}", other plugins require simply "MariaDB", as before.
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-2/+2
|\ \ \ \ | |/ / /
| * | | Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-2/+2
| | | |
* | | | rpm: prefer the conditional %{?...} syntaxSergei Golubchik2016-03-211-1/+1
| | | |
* | | | rpm: ignore /usr/lib/systemd and /usr/lib/systemd/systemSergei Golubchik2016-03-211-2/+4
| | | |
* | | | MDEV-9660 yum/rpm update from 10.0 to 10.1 replaces/obsoletes ?Sergei Golubchik2016-03-211-0/+1
| | | | | | | | | | | | | | | | MariaDB-server-10.1 should obsolete MariaDB-Galera-server
* | | | Provide a way to reenable DISABLED plugin with -DPLUGIN_${NAME}=STATIC|DYNAMICVladislav Vaintroub2016-03-131-4/+5
| | | |
* | | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Update WSREP_PATCH_REVNO.Nirbhay Choubey2016-02-231-1/+1
| | | |
| * | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-235-8/+25
| |\ \ \ | | |/ /
| * | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13Philip Stoev2016-02-231-1/+1
| | | |
| * | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 12Philip Stoev2016-02-221-1/+1
| | | |
| * | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-193-9/+8
| |\ \ \
* | \ \ \ Merge branch '10.0' into 10.1Sergei Golubchik2016-02-232-27/+25
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | MDEV-9350 Fix jemalloc detection for FreeBSDSergei Golubchik2016-02-171-7/+11
| | | | | | | | | | | | | | | | | | | | on FreeBSD 10 jemalloc is in libc, no separate libjemalloc is needed
| * | | | MYSQL_ADD_PLUGIN: fix DISABLED keyword to workSergei Golubchik2016-02-171-1/+1
| | | | |
| * | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-0/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | dtrace in cmakeSergei Golubchik2016-02-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | 1. ignore generated dtrace files 2. don't rewrite probes_mysql_nodtrace.h in-place
| | * | | MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-062-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick f1daf9ce from 10.0 branch ------------------------------------- Fix build failures caused by new C runtime library - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads - P_tmpdir, tzname are no more defined - lfind() and lsearch() in lf_hash.c had to be renamed, declaration conflicts with some C runtime functions with the same name declared in a header included by stdlib.h Also fix couple of annoying warnings : - remove #define NOMINMAX from config.h to avoid "redefined" compiler warnings(NOMINMAX is already in compile flags) - disable incremental linker in Debug as well (feature not used much and compiler crashes often) Also simplify package building with Wix, require Wix 3.9 or later (VS2015 is not compatible with old Wix 3.5/3.6)
* | | | | MDEV-9475 I can't finish my_install_db using binary tar distributionSergei Golubchik2016-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | to avoid run-time libjemalloc.so dependency link binary tarballs with a static libjemalloc_pic.a
* | | | | Fix build : change MYSQL_ADD_PLUGIN to be MACRO again, rather than FUNCTIONVladislav Vaintroub2016-02-221-5/+5
| | | | |
* | | | | MDEV-9601 Build client plugins, also for the cmake client-only buildVladislav Vaintroub2016-02-221-4/+9
| | | | | | | | | | | | | | | | | | | | (-DWITHOUT_SERVER=1)
* | | | | MDEV-9833 - fix mysql_config --libs for weird cases, where mysqlclient link ↵Vladislav Vaintroub2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | dependencies contain flags instead of libraries (like -pthread rather than -lpthread)
* | | | | MDEV-9564 - added s390x to lib64 INSTALL_LIBDIR handlingSergey Vojtovich2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted INSTALL_LIBDIR detection so that it is set to "lib64" on any 64bit system (not only x86_64). New condition is insipired by GNUInstallDirs cmake module.
* | | | | Fix packaging for client RPM plugins - provide 'ignored' listVladislav Vaintroub2016-01-261-5/+5
| | | | |
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-01-251-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '5.5' into 10.0Alexey Botchkov2016-01-251-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: plugin/server_audit/server_audit.c
| | * | | MDEV-9298 : Build failure when linking libmysql.Vladislav Vaintroub2016-01-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If GCC or CLang compile with link time optimization (-flto), they throw an error during link , when lto sees a function (e.g mysql_real_connect) is redeclared as "external void *" in libmysql_exports.cc The fix disables -flto for generated libmysql_exports.cc
* | | | | MDEV-9385 Devel package wants ownership of /usr/share/pkgconfig on CentOS/RHELSergei Golubchik2016-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | add /usr/share/pkgconfig to the rpm ignored list