summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
| | | | * Update wrong zip-code
* Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-271-2/+8
| | | | | | | Disable LOAD DATA LOCAL INFILE suport by default and auto-enable it for the duration of one query, if the query string starts with the word "load". In all other cases the application should enable LOAD DATA LOCAL INFILE support explicitly.
* Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-231-1/+1
|\
| * Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIESAditya A2018-07-091-1/+7
| | | | | | | | Upgrading the zlib lib to 1.2.11
| * Bug #25436469: BUILDS ARE NOT REPRODUCIBLETor Didriksen2017-05-161-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport to 5.5 Current MySQL builds, even on Pushbuild, are not reproducible; they return different results depending on which directory they are built from (and Pushbuild uses several different directories). This is because absolute paths leak into debug information, and even worse, __FILE__. The latter moves code around enough that we've actually seen sysbench changes on the order of 4% in some tests. CMake seemingly insists on using absolute paths, but we can insert our own layer between CMake and GCC to relativize all paths. Also give the right flags to get debug information reproducible and turn off build stamping. This makes the mysqld build 100% bit-for-bit reproducible between runs on my machine, even when run from different directories.
* | Revert "MDEV-16075: Workaround to run MTR test suite for make test"Sergei Golubchik2018-06-201-4/+0
| | | | | | | | | | | | | | | | | | 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.
* | MDEV-16075: Workaround to run MTR test suite for make testTeodor Mircea Ionita2018-06-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-111-8/+5
|\ \ | |/
| * Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ONTor Didriksen2017-01-171-5/+3
| | | | | | | | | | | | Post-push fix. Problem cmake without explicit build type was broken on windows. Fix: do not test for build type, always extend CMAKE_C[XX]_FLAGS_DEBUG
| * Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ONTor Didriksen2017-01-171-3/+2
| | | | | | | | | | | | The combination cmake -DENABLE_DEBUG_SYNC=0 -DWITH_DEBUG=ON fails to build. Fix: Remove option ENABLE_DEBUG_SYNC.
| * Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-071-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Updated CMakeLists.txt to include rpm-docker directoryBalasubramanian Kandasamy2015-06-161-1/+2
| |
* | remove COPYING.LESSERSergei Golubchik2017-03-211-2/+1
| | | | | | | | shouldn't have been added in the first place, MariaDB Server is GPLv2
* | MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release ↵Sergei Golubchik2017-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | -DCMAKE_BUILD_TYPE=Debug It's too plainful to require <my_config.h> to be included first for third-party storage engines. And anyway, some source files might not include <my_config.h> at all, so there is no guarantee that all parts of the binary will see identical definitions of system structures (e.g. struct stat). Define _FILE_OFFSET_BITS on the compiler's command line instead.
* | Fix warnings on Windows, compiler option -ggdb3 option is nonexistentVladislav Vaintroub2016-05-241-2/+4
| |
* | Merge remote-tracking branch 'bzr/5.5' into bb-5.5-mergeSergei Golubchik2015-02-121-0/+5
|\ \
| * | restore a cross-compiling bit that was lost in a mergeSergei Golubchik2015-02-101-0/+5
| | |
* | | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42Sergei Golubchik2015-02-111-2/+3
|\ \ \ | |/ / |/| / | |/
| * Bug#20136840 REMOVE REMAINING REFERENCES TO BZR IN CMAKE SCRIPTSTor Didriksen2014-12-111-1/+1
| | | | | | | | Patch for 5.5
| * Bug#19908468 PLACE CORRECT INFORMATION IN INFO_SRC AFTER TRANSITIONING TO GITTor Didriksen2014-11-111-1/+2
| | | | | | | | Use 'git log -1; git branch' rather than 'bzr version-info'
| * Bug#19890133 MAKE DIST USING BZR EXPORT EVEN FOR SOURCE DIR NOT A BZR REPOTor Didriksen2014-11-111-0/+3
| | | | | | | | | | For 'make dist': only use 'bzr export' if bzr root == ${CMAKE_SOURCE_DIR} Same thing for git.
| * Added sles11 repo packagesBalasubramanian Kandasamy2014-11-041-0/+1
| |
| * Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-131-39/+53
| | | | | | | | | | | | | | Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE Backport from mysql-5.6 to mysql-5.5
| * Bug#19001781: ADD SUPPORT FOR CMAKE 3Jon Olav Hauglid2014-06-241-0/+8
| | | | | | | | Set CMP0026 and CMP0045 policies when using CMake version 3 or higher to restore old CMake behavior.
| * Bug#18972488 Remove packaging/rpm-uln directory from source - Updated ↵Balasubramanian Kandasamy2014-06-171-1/+0
| | | | | | | | CMakeLists.txt
| * Backport of:Tor Didriksen2014-03-051-0/+6
| | | | | | | | | | | | | | | | | | Bug#17894997 CMAKE WARNING WRT INTERFACE_LINK_LIBRARIES Bug#17905155 CMAKE WARNING WHEN GENERATING MAKEFILE Bug#71089 CMake warning when generating Makefile Use old policy for LINK_INTERFACE_LIBRARIES.
| * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2014-01-161-11/+9
| | | | | | | | | | | | Bug#68338 RFE: make tmpdir a build-time configurable option Post-push fix: windows needs DEFAULT_TMPDIR as well.
| * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2014-01-161-9/+12
| | | | | | | | | | | | | | Bug#68338 RFE: make tmpdir a build-time configurable option Post-push fix: 'cmake -LH | grep TMP' showed TMPDIR as a BOOL option, which was a bit confusing: show it as a PATH instead.
| * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2013-12-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#68338 RFE: make tmpdir a build-time configurable option Background: Some distributions use tmpfs for mounting /tmp by default, which has some advantages, but brings also new issues. Fedora started using tmpfs on /tmp in version 18 for example. If not configured otherwise in my.cnf, MySQL uses system's constant P_tmpdir expanded to /tmp on Linux. This can introduce some problems with limited space in /tmp and also some data loss in case of replication slave [1]. In case distributions would like to use /var/tmp, which should be better for MySQL purposes, then we have to patch the source or change tmpdir option in my.cnf, which is however not updated in case it has already existed. Thus, it would be useful to be able to specify default tmpdir path using a configure option, while using P_tmpdir in case it is not defined explicitly. Based on a contribution from Honza Horak
| * Backport 5.5.35 EL6 uln repo rpmsBalasubramanian Kandasamy2013-11-251-0/+1
| |
| * Fix for Bug 17584523 - LICENSE AND DOCUMENTATION FILES MISSING FROM WINDOWS ↵Sreedhar.S2013-10-161-1/+2
| | | | | | | | MSI PACKAGE
| * Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE ↵Sreedhar.S2013-10-091-20/+0
| | | | | | | | LIBRARIES USED
| * Fix to copy missing pdb files BUG 13878021Sreedhar.S2013-09-301-0/+21
| |
| * Bug#17435338 ADD A -DWITH_ASAN SWITCH/OPTION TO OUR CMAKE SCRIPTSTor Didriksen2013-09-201-1/+77
| | | | | | | | | | | | | | | | Tested with: gcc (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1) clang version 3.1 (tags/RELEASE_31/final) Target: x86_64-apple-darwin10.8.0
| * Merge from 5.5 to 5.6Chaithra Gopalareddy2013-05-231-0/+1
| |\
| | * Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
| | |
| * | Bug 16534721 - MYSQL_INSTALL_DB RUNS AGAIN DURING UPGRADE EVEN DATA ↵Murthy Narkedimilli2013-04-031-1/+2
| | | | | | | | | | | | DIRECTORY EXISTS
| * | Placement change:Joerg Bruehe2012-11-071-1/+1
| | | | | | | | | | | | | | | Top level "SPECIFIC-ULN/" was inappropriate, put the files to create RPMs for ULN into "packaging/rpm-uln/".
| * | Merge changes for ULN RPMs into main 5.5Joerg Bruehe2012-09-211-0/+1
| |\ \
| | * | More changes to supporting the build of RPMs for ULNJoerg Bruehe2012-06-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the MySQL 5.5 source tree. Contrary to the comment, the spec file for these ULN RPMs was missing in the previous changeset (blame ".bzrignore"). This change now brings said spec file, and it adds cmake handling for the new files. Still for internal tool tests only, not yet ready for publishing.
| * | | Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BREAKS THE BUILDTor Didriksen2012-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore --with-client-ldflags it's not supported by the cmake scripts anyways. Ignore --with-mysqld-ldflags it's only used with --with-mysqld-ldflags=-static and that doesn't work.
| * | | upmerge 14035452 5.1 -> 5.5Bjorn Munch2012-07-191-0/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * Bug #14035452 - MODULARIZE MYSQL_CLIENT_TESTBjorn Munch2012-07-191-0/+3
| | | | | | | | | | | | | | | | | | Added new minimal client using same framework Added internal test using it Small changes to top level make/configure/cmake to have it built
| * | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ | | |/
| | * Updated/added copyright headersKent Boortz2011-07-031-1/+2
| | |\
| | | * fixing 38697/11749301MySQL Build Team2011-03-211-0/+1
| | | |
| | * | Updated/added copyright headersKent Boortz2011-06-301-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Updated/added copyright headersKent Boortz2011-06-301-1/+2
| | | |
| | | * Define _WIN32_WINNT to the minimum supported Windows version, 0x0500 i.eKent Boortz2009-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows 2000. Visual Studio 2003 and 2005 require _WIN32_WINNT >= 0x0500 (Win2000) for TryEnterCriticalSection.
| * | | Bug#13551687 CMAKE GENERATED PROJECT FILES ALWAYS HAVE THE SAME NAME IN ↵Tor Didriksen2012-01-161-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | VISUAL STUDIO Add option to set project name for Mac/Windows.