summaryrefslogtreecommitdiff
path: root/cmake/os
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-1/+1
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-1/+1
| |\
| | * VS2015 build fixesVladislav Vaintroub2016-10-271-1/+1
| | | | | | | | | | | | | | | | | | - new location of signtool - silence a nonsensical warning from stl header (complain about noexcept() function attribute, if /EHsc is not set)
| | * MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-062-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick f1daf9ce from 10.0 branch ------------------------------------- Fix build failures caused by new C runtime library - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads - P_tmpdir, tzname are no more defined - lfind() and lsearch() in lf_hash.c had to be renamed, declaration conflicts with some C runtime functions with the same name declared in a header included by stdlib.h Also fix couple of annoying warnings : - remove #define NOMINMAX from config.h to avoid "redefined" compiler warnings(NOMINMAX is already in compile flags) - disable incremental linker in Debug as well (feature not used much and compiler crashes often) Also simplify package building with Wix, require Wix 3.9 or later (VS2015 is not compatible with old Wix 3.5/3.6)
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-11-192-8/+7
|\ \ \ | |/ /
| * | MDEV-9024 Build fails with VS2015Vladislav Vaintroub2015-11-062-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build failures caused by new C runtime library - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads - P_tmpdir, tzname are no more defined - lfind() and lsearch() in lf_hash.c had to be renamed, declaration conflicts with some C runtime functions with the same name declared in a header included by stdlib.h Also fix couple of annoying warnings : - remove #define NOMINMAX from config.h to avoid "redefined" compiler warnings(NOMINMAX is already in compile flags) - disable incremental linker in Debug as well (feature not used much and compiler crashes often) Also simplify package building with Wix, require Wix 3.9 or later (VS2015 is not compatible with old Wix 3.5/3.6)
* | | dbug: correct trace for DBUG_RETURN(func()); -- gcc onlySergei Golubchik2015-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when func1 calls func2 from DBUG_RETURN, dbug shows the trace as | > func1 | < func1 | > func2 | < func2 because DBUG_LEAVE happens before func2(). Change that to invoke DBUG_LEAVE when the local variable goes out of scope. This uses gcc specific __attribute__((cleanup)).
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-4/+6
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-4/+6
| |\ \ | | |/
| | * Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-081-4/+6
| | |\
| | | * Bug #20168526 YASSL: CORRUPT SSL-KEY CRASHES CLIENTTor Didriksen2015-07-131-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post-push fix: broken build on windows. The problem is min/max macros from windows.h which interfere with a template function callex max. Solution: ADD_DEFINITIONS(-DNOMINMAX)
| | | * Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-131-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #18808072 MYSQLBINLOG USES LOCALTIME() TO PRINT EVENTS, CAUSES KERNEL ↵Venkatesh Duggirala2014-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MUTEX CONTENTION Problem: For every event read, mysqlbinlog calls localtime() which in turn calls stat(/etc/localtime) which is causing kernel mutex contention. Analysis and Fix: localtime() calls stat(/etc/localtime) for every instance of the call where as localtime_r() the reentrant version was optimized to store the read only tz internal structure. Hence it will not call stat(/etc/localtime). It will call only once at the beginning. The mysql server is calling localtime_r() and mysqlbinlog tool is one place where we are still using localtime(). Once the process (mysqlbinlog) is started if timezone is changed it will be not picked up the the process and it will continue with the same values as the beginning of the process. This behavior is in-lined with mysql server. Also adding localtime_r() and gmtime_r() support for windows.
| | | * Backport from trunk:Tor Didriksen2014-05-071-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#18187290 ISSUE WITH BUILDING MYSQL USING CMAKE 2.8.12 We want to upgrade to VS2013 on Windows. In order to do this, we need to upgrade to cmake 2.8.12 This has introduced some incompatibilities for .pdb files, and "make install" no longer works. To reproduce: cmake --build . --target package --config debug The fix: Rather than installing .pdb files for static libraries, we use the /Z7 flag to store symbolic debugging information in the .obj files.
| | | * Bug#17632386: WITH_ASAN CONFLICTS WITH -WL,--NO-UNDEFINEDJon Olav Hauglid2013-10-211-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wl,--no-undefined (=-z defs) gives linking errors when used with WITH_ASAN. According to the documentation: "When linking shared libraries, the AddressSanitizer run-time is not linked, so -Wl,-z,defs may cause link errors (don’t use it with AddressSanitizer)." This patch turns off -Wl,--no-undefined if WITH_ASAN is used.
| | | * Updated/added copyright headersKent Boortz2011-06-309-9/+13
| | | |
| | | * Don't check for FIONREAD on windows.Tor Didriksen2011-05-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Execution of platforms tests are slow/flaky when building on windows. in PB:mysql-next-mr-opt-team on 2011-05-18 for win x86 debug_max, i see: -- Looking for FIONREAD -- Looking for FIONREAD - found and the build fails.
| | | * Merge of fix for bug#11757855 from mysql-5.1 -> mysql-5.5.Nirbhay Choubey2011-04-301-0/+4
| | | |
| | | * Bug#11766320 MYSQL SYMBOLIC LINKS NOT WORKINGMagne Mahre2011-04-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MySQL converted from autotools to CMake, the preprocessor symbol USE_SYMDIR was omitted by mistake. Without this symbol, the code for checking .sym files is not built. This patch defines USE_SYMDIR when built on MS Windows.
| | | * Remove some leftovers from the removal of the gethostbyname wrappers.Davi Arnaut2011-04-131-3/+0
| | | |
| | | * Bug #58699 cannot build with gcc dbg on solarisTor Didriksen2010-12-211-1/+0
| | | |
| | | * avoid useless system check on WindowsVladislav Vaintroub2010-11-201-0/+1
| | | |
| | | * Bug#58313: CMake stops with VS Express if -DBUILD_CONFIG=mysql_release.cmakeVladislav Vaintroub2010-11-201-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug : -DBUILD_CONFIG=mysql_release sets SIGNCODE parameter which requires singtool.exe (part of Windows SDK) in order to be able to sign the binaries ( only if valid certificate is found). However singtool is not a part of the SDK shipped with Visual Studio Express, so the build fails claiming missing singtools.exe Fix: Do not use SIGNCODE wiith VC Express. Also, fix broken nmake build (*.rc files could not be compiled due to ADD_DEFINITIONS contaning C/C++ compiler specific flags)
| | | * GCC's link option only take a single hyphen.Davi Arnaut2010-10-201-1/+1
| | | |
| | | * Fix compile error on Windows after WL#1054 push.Vladislav Vaintroub2010-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error was introduced by typo in variable name (errormsg instead of correct errmsg) - Also, precache HAVE_PEERCRED to OFF in cmake\os\WindowsCache.cmake (to avoid useless system check). - Also, add missing check for errors from FormatMessage(). - Also, remove annoying CMake debug printout of MALLOC_LIB if this is not set.
| | | * Cleanup after bild team push.Vladislav Vaintroub2010-07-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed obvious errors (HAVE_BROKEN_PREAD is not true for on any of systems we use, definitely not on HPUX) * Remove other junk flags for OSX and HPUX * Avoid checking type sizes in universal builds on OSX, again (CMake2.8.0 fails is different architectures return different results) * Do not compile template instantiation stuff unless EXPLICIT_TEMPLATE_INSTANTIATION is used. * Some cleanup (make gen_lex_hash simpler, avoid dependencies) * Exclude some unused files from compilation (strtol.c etc)
| | | * Manual merge from mysql-trunk.Alexander Nozdrin2010-07-192-3/+2
| | | |\ | | | | | | | | | | | | | | | Conflicts: - scripts/CMakeLists.txt
| | | | * Fix syntax error (missing quote).Jonathan Perkin2010-07-011-2/+2
| | | | |
| | | | * Automerge the bug fix 54739 into the 5.5.5-m3 release clone.Joerg Bruehe2010-06-241-1/+2
| | | | |\
| | | | * | CMakeLists.txtKent Boortz2010-06-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake/build_configurations/mysql_release.cmake - Corrected spelling ENABLE_LOCAL_INFILE => ENABLED_LOCAL_INFILE - In addition to "RelWithDebInfo", set target "Release" and "Debug" - Set Debug flags - Enabled SSL on Mac OS X - For gcc builds, set RELEASE and DEBUG flags as well - For g++ builds, added "-fno-implicit-templates" - Use "-O" (gcc -O1) for optimized binaries, as "DEBUG" in out case is more about enabling trace support to the server, no optimization makes binaries too slow to be practical to reproduce problems cmake/os/WindowsCache.cmake - Removed unused HAVE_SYS_IOCTL config.h.cmake - Added header checks and missing defines - Removed unused HAVE_SYS_IOCTL - Grouped and uncommented some HAVE_* that are really not defines, but internal variables used in the CMake setup, - Added hard coded flags for HP-UX and Mac OS X configure.cmake - Added header checks and missing defines - Removed unused HAVE_SYS_IOCTL - "sys/dir.h" test needs "sys/types.h" - Corrected syntax for "sys/ptem.h" test - Don't exclude test for some types if Mac OS X, harmless to do the test and we want the HAVE_<type> settings - Added hard coded flags for HP-UX and Mac OS X extra/yassl/CMakeLists.txt extra/yassl/taocrypt/CMakeLists.txt - Added missing source file "template_instnt.cpp"
| | | * | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-152-1/+6
| | | |\ \ \
| | | | * \ \ Merge bug fix.Joerg Bruehe2010-06-231-1/+2
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Fix Bug #54739Joerg Bruehe2010-06-231-1/+2
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accidental change in compile-time definitions for FreeBSD Revert the accidental setting of "HAVE_BROKEN_REALPATH" on current versions of FreeBSD, do it for both autotools ("configure.in") and cmake ("cmake/os/FreeBSD.cmake").
| | | | * | Fix ~1000 warnings class/struct mismatch.Vladislav Vaintroub2010-06-221-0/+4
| | | | |/ | | | | | | | | | | Handle this warning in the future as error, this will prevent pushing to main trees.
| | | * | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-1/+0
| | | |/
| | | * Get rid of the "net retry count" difference whichJoerg Bruehe2010-05-271-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not needed any more with current versions of FreeBSD. (Entries 52410 and 52412 in the Bug DB) That change is based on Dan Nelson replying on the FreeBSD mailing list, freebsd-questions@freebsd.org in a thread running from 2010-Apr-29 to 2010-May-1 titled "Need info about FreeBSD and interrupted system calls for MySQL code" Also, ensure the cmake settings correspond to the autotools ones: Add "HAVE_BROKEN_REALPATH" to cmake.
| | | * Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P)Vladislav Vaintroub2010-03-081-2/+2
| | | |
| | | * On Solaris, overwrite CMake's proposed thread library -lthread with -lpthread. Vladislav Vaintroub2010-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | -lthread works fine in most cases, but at least with gcc 3.4.6 on x86, dlopen() crashes when libpthread is not used. Note : the workaround existed prior and did not work since CMAKE_THREADS_LIBS_INIT was already in cache. Now, use SET(.. CACHE FORCE) to overwrite the cached value.
| | | * Install static client and embedded debug librariesVladislav Vaintroub2010-02-201-0/+1
| | | |
| | | * SET FN_NO_CASE_SENSE to 1 on WindowsVladislav Vaintroub2010-02-201-0/+2
| | | |
| | | * fix typoVladislav Vaintroub2010-02-171-1/+1
| | | |
| | | * check for poll.hVladislav Vaintroub2010-02-141-0/+1
| | | |
| | | * Do not run checks for strtok_r on Windows - we know the function is not there..Vladislav Vaintroub2010-01-291-0/+1
| | | |
| | | * Add windows system check cache that prevents tests from running, most are ↵vvaintroub2010-01-292-2/+352
| | | | | | | | | | | | | | | | | | | | | | | | irrelevant anyway Add cached variable WITH_XXX_STORAGE_ENGINE for dynamic plugins that can be static or dynamic.
| | | * prettification of package names and fix compile bug on OSX/ppcVladislav Vaintroub2010-01-281-2/+0
| | | |
| | | * Added AIX, OS400 and Cygwin.Vladislav Vaintroub2010-01-273-0/+67
| | | | | | | | | | | | | | | | This finishes of moving code from configure.cmake IF()'s to platform specific files
| | | * fix default architecture flag (v8) on sparc32 gcc that prevent mysql from ↵Vladislav Vaintroub2010-01-272-1/+73
| | | | | | | | | | | | | | | | compilng, add HPUX.cmake
| | | * Fixed typos and failed mysqld--help test.Vladislav Vaintroub2010-01-261-1/+5
| | | |
| | | * Move FreeBSD specific hacks to cmake/os/FreeBSD.cmakeVladislav Vaintroub2010-01-261-0/+20
| | | |
| | | * Move OSX specific checks to cmake/os/Darwin.cmakeVladislav Vaintroub2010-01-261-0/+34
| | | |