summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-11849: Fix storage/innobase/* compile warningsJan Lindström2017-01-261-1/+9
|
* Fixes for using ssl with BUILD scripts.Monty2017-01-111-4/+9
| | | | | Needed as GNUTLS can't be used by MariaDB on many systems, like OpenSuse 13.2
* Merge branch '10.1' into 10.2Sergei Golubchik2016-12-296-3/+10
|\
| * 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
| | | | |
* | | | | update RPM metadata (vendor and contact)Sergei Golubchik2016-12-121-2/+2
| | | | |
* | | | | Attempt to fix strange rpm dependency issue following prior patchKristian Nielsen2016-11-211-0/+3
| | | | |
* | | | | Merge pull request #253 from grooverdan/10.2-MDEV-11195-numa-buildVladislav Vaintroub2016-11-041-16/+21
|\ \ \ \ \ | | | | | | | | | | | | MDEV-11195: Correct enablement of NUMA in innodb/xtradb
| * | | | | MDEV-11195: Simplify enablement of NUMA in innodb/xtradbDaniel Black2016-11-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Move common parts of {innodb,xtradb}/CmakeLists.txt to the macro.
| * | | | | MDEV-11195: Correct enablement of NUMA in innodb/xtradbDaniel Black2016-11-011-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No -DHAVE_LIBNUMA=1 was passed to the source compile (and the global include/my_config.h wasn't used). This also is Linux only so corrected the cmake macro. Fixed indenting in cmake macro. Removed NUMA defination from include/my_config.h as its only in the storage engine. Thanks Elena Stepanova and Vladislav Vaintroub for the detailed list of bugs/questions. Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
* | | | | | MDEV-6284: Install systemd files (almost) the Debian wayOtto Kekäläinen2016-10-291-6/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The control file contents must be correct from the start and cannot be modified at build time by CMake. Also all static Debian package analyzers will fail to see all manipulations by CMake later on. It is best to do all manipulations like these in autobake-deb.sh.
* | | | | Merge branch '10.2-numa' of https://github.com/grooverdan/mariadb-server ↵Jan Lindström2016-10-241-0/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into grooverdan-10.2-numa
| * \ \ \ \ Merge 10.2Daniel Black2016-09-2311-58/+216
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
| * | | | | | MDEV-10829: Enable Innodb NUMA interleaveDaniel Black2016-09-231-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code was already existing within the innobase/xtradb storage engines however without this cmake code it was never enabled. num.cmake heavily based off work by Annamalai Gurusami <annamalai.gurusami@oracle.com> Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
* | | | | | | more adequate rpm settingsSergei Golubchik2016-09-231-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | new MariaDB-shared no longer provides or replaces mysql-libs or mariadb-libs
* | | | | | | RPM fixes for CentOS7 and FedoraSergei Golubchik2016-09-231-17/+10
| |/ / / / / |/| | | | |
* | | | | | copy-paste error fixedSergei Golubchik2016-09-221-1/+1
| | | | | |
* | | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-212-1/+45
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '10.2' into bb-10.2-janSergei Golubchik2016-09-192-1/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 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
| | | | |\ \ \ | | | | | |/ /
| * | | | | | Fix bunch of test failures and solaris build missing include.Jan Lindström2016-09-091-0/+44
| | | | | | |
* | | | | | | set the default socket addr for C/CSergei Golubchik2016-09-191-0/+1
| | | | | | |
* | | | | | | only put real *.so.* shared libraries in compat.rpmSergei Golubchik2016-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | do not put there *.so symlinks
* | | | | | | install client plugins into their old locationSergei Golubchik2016-09-141-0/+2
| | | | | | |
* | | | | | | pass openssl config to C/CSergei Golubchik2016-09-122-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * set OPENSSL_FOUND * use FindOpenSSL.cmake compatible variable names in ssl.cmake * show openssl version in full
* | | | | | | auto-clone C/C, if possibleSergei Golubchik2016-09-121-0/+14
| | | | | | |
* | | | | | | After-review changesSergei Golubchik2016-09-121-78/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove redundant code * fix tests * move declarations and defines where they belong
* | | | | | | Build 10.1 compat rpmSergei Golubchik2016-09-121-27/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repack 10.1.x-shared rpm to 10.2.x-compat.rpm Also remove old references to ourdelta rpms.
* | | | | | | fix RPM buildsSergei Golubchik2016-09-122-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to specify correct VENDOR and LICENSE for C/C
* | | | | | | fix "make dist" to support submodulesSergei Golubchik2016-09-121-9/+1
| | | | | | |
* | | | | | | Add C/C as a submodule in libmariadb/Sergei Golubchik2016-09-122-30/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also * fix includes * rename cmake macros and targets to avoid name clashes
* | | | | | | fix cmake MESSAGE_ONCE macro for multi-line messagesSergei Golubchik2016-09-121-5/+12
| | | | | | |
* | | | | | | make CONNECT's finding Java and JNI less verboseSergei Golubchik2016-09-122-0/+16
| | | | | | |
* | | | | | | add libmysqlclient's dependencies to the output of mysql_configVladislav Vaintroub2016-08-251-4/+9
| | | | | | |
* | | | | | | Increase shared library versionVladislav Vaintroub2016-08-251-1/+1
| | | | | | |
* | | | | | | MDEV-9293 - Use MariaDB's Connector/C in serverVladislav Vaintroub2016-08-253-2/+115
| |/ / / / / |/| | | | |