summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Minor spelling fixes in code comments, docs and outputOtto Kekäläinen2018-01-121-1/+1
| | | | | This commit does not touch any variable names or any other actual code, and thus should not in any way affect how the code works.
* Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-111-0/+5
|\
| * Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-111-0/+5
| |\
| | * Windows, compilation : Treat warning as error, if MYSQL_MAINTAINER_MODEVladislav Vaintroub2018-01-091-0/+5
| | | | | | | | | | | | | | | | | | is set to ERR This matches gcc/clang handling.
* | | MDEV-14881 cmake should succeed after installing libaio.Vladislav Vaintroub2018-01-071-0/+2
| | | | | | | | | | | | | | | | | | In case libaio is not found, and required, remove variables HAVE_LIBAIO_H and HAVE_LIBAIO from cache, so that cmake rerun after installation of libaio would succeed.
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-043-2/+9
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-013-2/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/make_dist.cmake.in mysql-test/r/func_json.result mysql-test/r/ps.result mysql-test/t/func_json.test mysql-test/t/ps.test sql/item_cmpfunc.h
| | * MDEV-12458: Variable and log records to indicate RocksDB version are missingVarun Gupta2017-12-311-0/+3
| | | | | | | | | | | | Added a system variabe rocsdb_git_hash to MyRocks which tell us the version of RocksDB being used
| | * MDEV-9869 INSTALL SONAME 'ha_connect'Sergei Golubchik2017-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | fix 011497bd603 in RPM and DEB: storage engine packages must require the server package of exactly correct version.
| | * Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-221-1/+5
| | |\
| | | * Generate and install sysusers and tmpfiles configurationChristian Hesse2017-12-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using systemd we can automate creating users and directories. So generate and install the configuration files. Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org> Small change in cmake/install_layout.cmake compared to original contributor patch to also install SYSTEMD_SYSUSERS and SYSTEMD_TMPFILES directories. The variables were being set, but the loop which defines the final install files was not updated.
* | | | Fix ssl cmake configuration not checking for symbols properlyVicențiu Ciorbaru2017-12-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Both libraries and includes are required to check for symbols correctly. In addition, we don't use SHA512_DIGEST_LENGTH symbol so remove the extraneous check.
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-12-121-1/+1
|\ \ \ \ | |/ / /
| * | | Adding the -Wnon-virtual-dtor GCC/CLang flag in maintainer modeAlexander Barkov2017-12-081-1/+1
| | | |
* | | | MDEV-12501 -- set --maturity-level by defaultVesa Pentti2017-12-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Note: breaking change; since this commit, a plugin that has worked so far might get rejected due to plugin maturity * mariabackup is not affected (allows all plugins) * VERSION file defines SERVER_MATURITY, which defines the corresponding numeric value as SERVER_MATURITY_LEVEL in include/mysql_version.h * The default value for 'plugin_maturity' is SERVER_MATURITY_LEVEL - 1 * Logs a warning if a plugin has maturity lower than SERVER_MATURITY_LEVEL * Tests suppress the plugin maturity warning * Tests use --plugin-maturity=unknown by default so as not to fail due to the stricter plugin maturity handling
* | | | Revert "MDEV-12501 -- set --maturity-level by default"Vesa Pentti2017-12-051-5/+0
| | | | | | | | | | | | | | | | This reverts commit 1af2d7ba235305ffd4c24a47cccafd5fe6815d9e.
* | | | MDEV-12501 -- set --maturity-level by defaultVesa Pentti2017-12-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Note: breaking change; since this commit, a plugin that has worked so far might get rejected due to plugin maturity * mariabackup is not affected (allows all plugins) * VERSION file defines SERVER_MATURITY, which defines the corresponding numeric value as SERVER_MATURITY_LEVEL in include/mysql_version.h * The default value for 'plugin_maturity' is SERVER_MATURITY_LEVEL - 1 * Logs a warning if a plugin has maturity lower than SERVER_MATURITY_LEVEL * Tests suppress the plugin maturity warning * Tests use --plugin-maturity=unknown by default so as not to fail due to the stricter plugin maturity handling
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-11-302-2/+3
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-11-292-2/+3
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2017-11-241-1/+2
| | |\ \ | | | |/
| | | * Fix typo, and disable own dtrace proibes on Solaris, really.Vladislav Vaintroub2017-11-211-1/+1
| | | |
| | | * Fix compile error.wlad2017-11-211-1/+1
| | | |
| | | * MDEV-14283 : Fix Solaris 10 build.wlad2017-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | - introduce system check for posix_memalign (not available on Solaris 10) - Disable dtrace probes, to fix weird link errors in mariabackup
| | * | Merge branch '10.1' into 10.2Sergei Golubchik2017-11-211-1/+1
| | |\ \ | | | |/
| | | * Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2017-11-101-1/+1
| | | |\
| | | | * MW-406 Bumped up the wsrep patch version (5.6.37-25.21)Teemu Ollakka2017-11-081-1/+1
| | | | |
| | | | * Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-036-52/+72
| | | | |\
* | | | | \ Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-305-15/+31
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | TODO: enable MDEV-13049 optimization for 10.3
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-305-15/+31
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-13836 mariadb_config & mysql_config output differSergei Golubchik2017-10-261-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | compile C/C with system zlib, when the server uses system zlib
| | * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-243-5/+27
| | |\ \ \ \ | | | |/ / /
| | | * | | Various compier warningsSergei Golubchik2017-10-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | gcc 5.4 and 7.1, Debug and Release builds
| | | * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-2/+14
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | MDEV-13412 main.func_regexp_pcre fails in buildbot on ppc64leSergei Golubchik2017-10-091-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused by 2fcd8c12522. It used the documented pcre API -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) to calculate the pcre stack frame size. Unfortunately, modern compilers broke it by cloning and inlining pcre match() function. 2fcd8c12522 tried to workaround it by setting the stack frame size to at least 500. It didn't work, 500 is not a universal constant. Now we fix our copy of pcre to not inline or clone match() - so that stack frame detection would work again - and detect at cmake time whether system pcre is broken or usable. Also use stack, not (much slower) malloc in bundled pcre, unless on Windows
| | | * | | MDEV-13946 Server RPMs have dependency on "which"Sergei Golubchik2017-10-091-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SLES11 doesn't have a dedicated package for "which", it's part of the "util-linux" package
| | * | | | MDEV-13836 mariadb_config & mysql_config output differSergei Golubchik2017-10-181-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow to build with the default port number 3306. Now -DMYSQL_TCP_PORT=# sets the default port name and -DMYSQL_TCP_PORT_DEFAULT=# sets the magic port=0 behavior, if it's MYSQL_TCP_PORT_DEFAULT=0 it's enabled, otherwise - disabled.
* | | | | | fix TSAN build with ClangEugene Kosov2017-10-062-3/+3
| | | | | |
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-042-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-022-4/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-282-4/+4
| | | | | |
| | * | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix win64 pointer truncation warnings (usually coming from misusing 0x%lx and long cast in DBUG) - Also fix printf-format warnings Make the above mentioned warnings fatal. - fix pthread_join on Windows to set return value.
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-252-3/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-09-232-3/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-09-221-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | But without f4f48e06215..f8a800bec81 - fixes for MDEV-12672 and related issues. 10.2 specific fix follows...
| | | * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-09-211-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | remove an empty file with a wrong nameSergei Golubchik2017-09-201-0/+0
| | | | | |
| | * | | | CMake : Do not use FindPkgConfig on WindowsVladislav Vaintroub2017-09-211-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if cmake can find pkg-config (e.g the one supplied with strawberry perl ), we cannot link with pkg-config-found libraries or use the headers -they are mingw, 32bit-only.
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-09-231-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-12583 : Bake the git hash into the binaries.Vladislav Vaintroub2017-09-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added version_source_revision server "variable", for the git revision. Also , mysql -V will show git revision. "make dist" will now pack source_revision.h into the source package.
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-216-53/+64
|\ \ \ \ \ \ | |/ / / / /
View Lorry Controller Status