summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | 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 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 branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-195-48/+57
|\ \ \ | |/ /
| * | 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
* | | cleanupSergei Golubchik2017-09-181-2/+2
| | | | | | | | | | | | | | | Item_func_format::print() was redundant and other changes
* | | bugfix: don't overwrite tokudb.cnf during the buildSergei Golubchik2017-09-181-3/+5
| | |
* | | Merge 10.1 into 10.2Marko Mäkelä2017-08-311-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For running the Galera tests, the variable my_disable_leak_check was set to true in order to avoid assertions due to memory leaks at shutdown. Some adjustments due to MDEV-13625 (merge InnoDB tests from MySQL 5.6) were performed. The most notable behaviour changes from 10.0 and 10.1 are the following: * innodb.innodb-table-online: adjustments for the DROP COLUMN behaviour change (MDEV-11114, MDEV-13613) * innodb.innodb-index-online-fk: the removal of a (1,NULL) record from the result; originally removed in MySQL 5.7 in the Oracle Bug #16244691 fix https://github.com/mysql/mysql-server/commit/377774689bf6a16af74182753fe950d514c2c6dd * innodb.create-index-debug: disabled due to MDEV-13680 (the MySQL Bug #77497 fix was not merged from 5.6 to 5.7.10) * innodb.innodb-alter-autoinc: MariaDB 10.2 behaves like MySQL 5.6/5.7, while MariaDB 10.0 and 10.1 assign different values when auto_increment_increment or auto_increment_offset are used. Also MySQL 5.6/5.7 exhibit different behaviour between LGORITHM=INPLACE and ALGORITHM=COPY, so something needs to be tested and fixed in both MariaDB 10.0 and 10.2. * innodb.innodb-wl5980-alter: disabled because it would trigger an InnoDB assertion failure (MDEV-13668 may need additional effort in 10.2)
| * | 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>
* | | | | | | One more attempt to fix dependencies with mysqld import/export librariesVladislav Vaintroub2017-08-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with Visual Studio simplify logic, VS generator seems to have problems if generated file (with ADD_CUSTOM_COMMAND) depends on another generated file. So, the fix is just to have mysqld_lib.{def,lib,exp} to be generated in a single ADD_CUSTOM_COMMAND rather than two steps.
* | | | | | | submodules.cmake: git returns 128 if not in a repositoryDaniel Black2017-08-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible that a .git directory isn't definitive on the existance of a working git tree. A git worktree over sshfs for instance will fail to build unless the main repository also exists in the same directory. Adding this extra test will make the detection that little more ruggardised for these odd build environments. Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
* | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-08-291-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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.
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-172-5/+8
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | | * | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BEArun Kuruvila2016-09-281-8/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RESTRICTED IN ALL GA RELEASES Back port of WL#6782 to 5.5 and 5.6. This also includes back port of Bug#20771331, Bug#20741572 and Bug#20770671. Bug#24695274 and Bug#24679907 are also handled along with this.
| | | | * | | Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-072-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem Statement ========= Fix various issues when building MySQL with Visual Studio 2015. Fix: ======= - Visual Studio 2015 adds support for timespec. Add check and related code to use this and only use our replacement if timespec is not defined. - Rename lfind/lsearch to my* to avoid redefinition problems. - Set default value for TMPDIR to "" on Windows as P_tmpdir no longer exists. - using VS definition of snprintf if available - tzname are now renamed to _tzname.
| * | | | | | disallow invalid values for WITH_SYSTEMD cmake variable.Sergei Golubchik2017-08-081-1/+3
| | | | | | |
* | | | | | | cmake: update submodules automatically during the buildSergei Golubchik2017-08-142-14/+30
| | | | | | |
* | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-052-2/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'bb-10.1-vicentiu' into 10.1Vicențiu Ciorbaru2017-06-271-1/+6
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch '10.0' into 10.1Vicențiu Ciorbaru2017-06-211-1/+6
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2017-06-201-1/+6
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | / | | | | |_|_|/ | | | |/| | |
| | | | * | | MDEV-4646 No mysqld-debug or debuginfo in MariaDB-Server RPMSergei Golubchik2017-06-181-0/+1
| | | | | | |
| | | | * | | Use CPACK_RPM_FILE_NAME="RPM-DEFAULT"Daniel Black2017-06-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been implemented in for cmake-3.6 to match distro version of what the filename should look like. Thanks to Domen Vranka for the suggestion.
| | | | * | | Attempt to fix strange rpm dependency issue following prior patchKristian Nielsen2017-04-201-0/+3
| | | | | | |
| * | | | | | MDEV-12193 Discontinue support of unsecure and unsupported OpenSSL versions ↵Sergei Golubchik2017-06-221-11/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | (< 1.0.1)
* | | | | | MDEV-12938 Discrepancy between mysql_config and mariadb_configSergei Golubchik2017-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the correct target name when querying libmariadb.so dependencies. Filter out linker options (no-undefined and the version script)
* | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-06-081-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Replace have_innodb_zip.inc with innodb_page_size_small.inc.
| * | | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2017-05-261-1/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |