summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-252-0/+12
|\
| * MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helperSergei Golubchik2018-07-192-0/+11
| | | | | | | | | | | | | | Don't install server files if WITHOUT_SERVER is specified. "Server files" are defined as files going into the MariaDB-Server RPM, that is files in the components Server, ManPagesServer, Server_Scripts, IniFiles, SuportFiles, and Readme.
* | Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanjaOleksandr Byelkin2018-07-191-1/+1
|\ \ | |/
| * MDEV-16596 : Windows - redo log does not work on native 4K sector disks.Vladislav Vaintroub2018-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Disks with native 4K sectors need 4K alignment and size for unbuffered IO (i.e for files opened with FILE_FLAG_NO_BUFFERING) Innodb opens redo log with FILE_FLAG_NO_BUFFERING, however it always does 512byte IOs. Thus, the IO on 4K native sectors will fail, rendering Innodb non-functional. The fix is to check whether OS_FILE_LOG_BLOCK_SIZE is multiple of logical sector size, and if it is not, reopen the redo log without FILE_FLAG_NO_BUFFERING flag.
* | Adopt Debian's fix-FTBFS-on-GNU-Hurd.patch.Sergei Petrunia2018-06-292-0/+7
| | | | | | | | | | | | | | - Took the original patch by Ondrej Sury; - Applied a fix for a known problem in the patch: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882062 - Fixed a few other issues
* | Merge branch '10.0' into 10.1Sergei Golubchik2018-06-211-1/+1
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2018-06-211-1/+1
| |\
| | * Revert "MDEV-16075: Workaround to run MTR test suite for make test"Sergei Golubchik2018-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d39629f01ebdd5b89186e6c8a4a8d3dd528bd26a. Because running mtr for many hours with no output whatsoever is not really what we should do. And in 5.5 `make test` just works anyway, nothing to fix here.
* | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-1/+1
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-101-1/+1
| |\ \ | | |/
| | * MDEV-16075: Workaround to run MTR test suite for make testTeodor Mircea Ionita2018-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assign all tests added via MY_ADD_TEST to a bogus default_ignore target, so that they are not ran by default when doing bare make test. Add default test named MTR that calls mysql-test-run suite, which is now the single test run by make test. In consequence, modified unit/suite.pm to exclude the MTR test and run the real ctests flagged for default_ignore target, thus no circular loop.
* | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-03-191-1/+1
|\ \ \
| * | | Bump wsrep patch version to 25.23Teemu Ollakka2018-02-251-1/+1
| | | |
| * | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-011-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: storage/innobase/lock/lock0lock.cc storage/xtradb/lock/lock0lock.cc storage/xtradb/lock/lock0wait.cc support-files/mysql.server.sh
* | | | correctly detect unsupported compiler flagsSergei Golubchik2018-02-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in gcc `-Wno-unsupported-something` will not be an error or even a warning, so cmake will think the flag is supported. But if there's any other warning during compilation, for any reason, unknown option will be a warning too. Or an error when -Werror, even if that "other warning" would not be an error on itself. So we need to detect whether `-Wno-unsupported-something` is *really* supported. Luckily, `-Wunsupported-something` will always fail with an error. So, whenever there's a need to detect if -Wno-something is supported, test -Wsomething instead.
* | | | cleanup: simplify maintainer.cmakeSergei Golubchik2018-02-061-45/+21
| | | |
* | | | silence the annoying compiler warningSergei Golubchik2018-02-051-0/+2
| | | |
* | | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-01-181-0/+1
| | |\ \
| | | * | dos2unix cmake/mysql_add_executable.cmakeTor Didriksen2017-11-091-48/+48
| | | | |
| | | * | Bug#26022865 BUILD FOR WINDOWS-S12-64BIT,ADVANCED IS FAILING ON PB2 MYSQL-5.6Tor Didriksen2017-11-092-66/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cmake code for signing executables. Automatic signing has always failed anyways. It should be done manually as part of the release process.
* | | | | 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 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 '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
| |\ \ \ \ | | |/ / /
* | | | | 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
* | | | | 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
| | | | |
* | | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-195-48/+57
|\ \ \ \ \ | |/ / / /
| * | | | Build improvements and cleanups.Vladislav Vaintroub2017-09-085-48/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - the probably ultimate fix for dependencies on VS - remove some GET_TARGET_PROPERTY(LOCATION ...), they are deprecated in cmake 3.9 - simplify signing targets on Windows. - remove INSTALL_DEBUG_TARGET, we do not mix binaries from different builds in the same package
* | | | | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1Jan Lindström2017-08-291-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | MW-383 Bumped wsrep patch versionTeemu Ollakka2017-08-141-1/+1
| | | | | |
| | * | | | Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-092-4/+10
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-306-4/+43
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
* | | \ \ \ \ \ Merge 10.0 into 10.1Marko Mäkelä2017-08-281-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Windows compile : make compilation fail on "uninitialized variable used" ↵Vladislav Vaintroub2017-08-241-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning C4700 This is a genuine error, and will crash debug buildd in runtime checks if not fixed. it is better to fail during compile.
* | | | | | allow OpenSSL 0.9.8 againSergei Golubchik2017-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this disables the check, added in d937916c06 Applications shouldn't police OpenSSL versions that users are using. And 0.9.8 on Mac OS X seems to have new fixes, despite being "0.9.8"
* | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-3/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-251-3/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2017-07-181-3/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug#25942414: SSL VARIABLES USAGE WHEN LIBMYSQL IS COMPILED WITH WITH_SSL=NOHarin Vadodaria2017-04-272-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description: If libmysql is compiled with WITH_SSL=NO, --ssl-* are not useful. Solution: 1. Restricted WITH_SSL to values : bundled | yes | system 2. Made "bundled" as default value for WITH_SSL. Also, not specifying WITH_SSL or even specifying WITH_SSL=no will be treated as/converted to WITH_SSL=bundled. Reviewed-By: Tor Didriksen <tor.didriksen@oracle.com> Reviewed-By: Georgi Kodinov <georgi.kodinov@oracle.com>
| | | * | | Bug#25611609 LINK WITH DYNAMIC RUNTIME LIBRARIES ON WINDOWSTor Didriksen2017-02-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch for 5.5 and 5.6 Use default runtime libraries on windows, i.e. build with /MD