summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-08-061-5/+0
| | | | | | | Post-merge fix: remove --with-debug=full, it was only used for safemalloc. BUILD/compile-pentium-mysqlfs-debug: Remove build script for a feature that is long gone.
* Build cleanupsVladislav Vaintroub2010-08-051-6/+23
| | | | | | | | | | | | | | | | | - Simplify sql-bench installation, do not try to resolve names : this leads to probem if builddir is symlink located on different filesystem. (reported by alik) - Make WITHOUT_XXX (disabling plugin) work for DEFAULT plugins. Prior to the patch is behaved just like MANDATORY. - LINK_LIBRARIES in MYSQL_ADD_PLUGIN had no effect for statically linked plugins. - Fix constant rebuild of initdb target on Windows.
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-2/+2
|\
| * Auto-merge from mysql-trunk.Alexander Nozdrin2010-07-232-3/+0
| |\
| * | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-201-2/+2
| | | | | | | | | | | | | | | | | | due to GCC preprocessor change Addendum for trunk: add -DMYSQL_ABI_CHECK to the cmake ABI check.
* | | 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)
* | Revert the ndb removal for now.Jonathan Perkin2010-07-202-3/+0
|/
* bug#55250: 5.5.5-m3 incorrectly compiled with exceptions on Solaris/x86Jonathan Perkin2010-07-191-1/+1
| | | | | Put '-features=no%except' back into Solaris/x86 CXXFLAGS.
* Manual merge from mysql-trunk.Alexander Nozdrin2010-07-196-50/+103
|\ | | | | | | | | Conflicts: - scripts/CMakeLists.txt
| * Spell CMAKE_COMPILER_IS_GNUCC correctly.Jonathan Perkin2010-07-061-1/+1
| |
| * I'm pretty sure 'CXX_FLAGS' is a typo for 'CMAKE_CXX_FLAGS', andJonathan Perkin2010-07-051-2/+2
| | | | | | | | | | | | | | this is the reason why -fno-implicit-templates is removed from the entire build when sourcing this file, rather than just limited to yassl sources.
| * Remove flags which have already been defined in configure.cmake.Jonathan Perkin2010-07-051-3/+4
| | | | | | | | | | Add a note to investigate -felide-constructors usage on OSX.
| * Fix typo in previous.Jonathan Perkin2010-07-051-1/+1
| |
| * kent's recent changes to this file resulted in flag loss due toJonathan Perkin2010-07-051-62/+81
| | | | | | | | | | | | | | | | | | | | | | the way cmake parses, in particular CMAKE_SIZEOF_VOID_P was uninitialized during the first parse, and the bad values were cached. Pull in SIZEOF_VOIDP macro from package_name.cmake, define some useful variables, and clean up the file a bit with explicit definitions, to hopefully avoid this problem in the future.
| * Fix icc/icpc flags.Jonathan Perkin2010-07-021-2/+6
| |
| * Don't cache {C,CXX} flags, this file is parsed twice, the first timeJonathan Perkin2010-07-021-14/+8
| | | | | | | | | | CMAKE_SIZEOF_VOID_P is unset so the variables are set incorrectly.
| * Fix syntax error (missing quote).Jonathan Perkin2010-07-011-2/+2
| |
| * Fix previousJonathan Perkin2010-06-251-0/+2
| |
| * Update ICC flags to avoid deprecated options.Jonathan Perkin2010-06-251-2/+2
| |
| * Ensure aio is available on Linux.Jonathan Perkin2010-06-251-0/+10
| |
| * Automerge the bug fix 54739 into the 5.5.5-m3 release clone.Joerg Bruehe2010-06-241-1/+2
| |\
| * | Remove storage/ndb from dist sources.Jonathan Perkin2010-06-232-0/+3
| | |
| * | CMakeLists.txtKent Boortz2010-06-232-46/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-154-9/+23
|\ \ \
| * | | Remove leftovers from old versions of the code.Davi Arnaut2010-07-131-2/+1
| | | |
| * | | Bug #52850: mysqld-debug.pdb doesn't match Vladislav Vaintroub2010-06-301-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld-debug.exe in 5.5.3 on windows Fix: - Do not rename PDB, install mysqld.pdb matching mysqld-debug.exe into bin\debug subdirectory - Stack tracing code will now additionally look in debug subdirectory of the application directory for debug symbols. - Small cleanup in stacktracing code: link with dbghelp rather than load functions dynamically at runtime, since dbghelp.dll is always present. - Install debug binaries with WiX cmake/install_macros.cmake: Add optional COMPONENT and PDB_DESTINATION to INSTALL_DEBUG_TARGET mysys/stacktrace.c: If binary is build with DBUG, also look in debug subdirectory of executable directory. Packaging will put some PDBs there (e.g bin\mysqld-debug.exe will have corresponding pdb in bin\debug) Also some cleanup: do not load dbghelp dynamically, instead link with it. dbghelp is present on all Windows starting with XP. packaging/WiX/CPackWixConfig.cmake: Install debug binaries sql/CMakeLists.txt: Do not rename PDB for mysqld-debug.exe, install it in debug subdirectory
| * | | 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 syntax error (missing space in SET command), that effectively prevents ↵Vladislav Vaintroub2010-06-221-1/+1
| | | | | | | | | | | | | | | | mysqld from being build with SSL.
| * | | 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.
* | | Add the cmake option MYSQL_MAINTAINER_MODE which is equivalentDavi Arnaut2010-07-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | to the autotools option mysql-maintainer-mode. This option is intended to set a few flags that should be activated by anyone doing MySQL development, regardless of the build type. Also, the flags are only set by the very end of the platform checks as to not disturb fragile checks.
* | | Unset the execute bit where it's not needed.Davi Arnaut2010-07-031-0/+0
| | |
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-1/+0
| |/ |/|
* | Made the changes as per Kent/wlad to include ↵sunanda2010-06-231-1/+1
|/ | | | http://lists.mysql.com/commits/111802
* Post-push fixups for WL#5349Magne Mahre2010-06-221-1/+2
| | | | | | | mysql-test/suite/perfschema/t/no_threads-master.opt: Innodb will start multiple threads, which is not compatible with --one-thread. Disable innodb to be able to run the test case.
* mergeDaniel Fischer2010-06-186-20/+115
|\
| * mergeDaniel Fischer2010-05-273-89/+114
| |\
| | * Get rid ot the "net retry count" difference whichJoerg Bruehe2010-05-211-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. cmake/os/FreeBSD.cmake: With current versions of FreeBSD, threading is not done on the user-level any more, so the huge "net retry count" is not needed any more. However, it is still being kept for now, so that it can be re-activated should the need arise. In addition, set "HAVE_BROKEN_REALPATH" to completely mirrot the autotools path. configure.in: With current versions of FreeBSD, threading is not done on the user-level any more, so the huge "net retry count" is not needed any more. However, it is still being kept for now, so that it can be re-activated should the need arise. Adapt the informational messages to the path taken.
| | * Explicitly set OSX flags, to match current release.Jonathan Perkin2010-05-071-2/+2
| | |
| | * Tidy install layout.Jonathan Perkin2010-05-061-81/+106
| | | | | | | | | | | | | | | Remove 'ROOT' from sql-bench dir variable, it's unnecessary.
| | * Build all plugins.Jonathan Perkin2010-05-051-3/+0
| | | | | | | | | | | | | | | Try to fix ia64/icc builds.
| * | apply wlad's patch to read the fill_help_tables.sql file whole, not line by lineDaniel Fischer2010-04-301-2/+3
| | |
| * | mergeDaniel Fischer2010-04-301-2/+2
| |\ \ | | |/
| | * Sync icc flags with reality.Jonathan Perkin2010-04-281-2/+2
| | |
| * | MergeDaniel Fischer2010-04-2113-116/+435
| |\ \ | | |/
| | * Only use /usr/lib64 on x86_64, ia64 for example still uses /usr/libJonathan Perkin2010-04-191-1/+1
| | |
| | * Disable SSL with Intel CCJonathan Perkin2010-04-161-0/+1
| | |
| | * Fix SVR4 datadirJonathan Perkin2010-04-011-1/+1
| | |
| | * Try to fix datadirJonathan Perkin2010-04-011-2/+2
| | |
| | * Apply wlad fixes from mysql-next-mr-bugfixingJonathan Perkin2010-03-312-9/+8
| | |