summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* 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"
* 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
| | |
| | * Back out remains of previous attempt.Jonathan Perkin2010-03-301-6/+1
| | |
| | * Fix from wlad.Jonathan Perkin2010-03-301-0/+31
| | |
| | * Try again..Jonathan Perkin2010-03-301-3/+6
| | |
| | * Try to fix the debug permissions stuff.Jonathan Perkin2010-03-301-1/+3
| | |
| | * Install debug plugins, from wlad.Jonathan Perkin2010-03-261-0/+1
| | |
| | * Expand INSTALL_INFODIR correctly.Jonathan Perkin2010-03-251-1/+1
| | | | | | | | | | | | | | | Make mysql.info optional.
| | * Don't install documentation when INSTALL_LAYOUT=RPM, as the spec fileJonathan Perkin2010-03-251-2/+2
| | | | | | | | | | | | | | | prefers to take docs directly from the source tree.
| | * Add INSTALL_INFODIR and use it to install mysql.info into theJonathan Perkin2010-03-251-0/+4
| | | | | | | | | | | | | | | correct location.
| | * Avoid newline in date output.Jonathan Perkin2010-03-241-1/+1
| | |
| | * Try to add support for MYSQL_U_SCORE_VERSION and MYSQL_COPYRIGHT_YEAR.Jonathan Perkin2010-03-241-0/+11
| | |
| | * Fix mysql-test directory in RPMs.Jonathan Perkin2010-03-231-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While here: - split INSTALL_*DIR variables into two sections, first set the major variables, then second set the minor ones, using the major where appropriate. - format the settings for easier parsing (at least with a wide terminal)
| | * First cut at -DINSTALL_LAYOUT=DEB support.Jonathan Perkin2010-03-231-0/+24
| | |
| | * Install libs directly into %{_libdir}Jonathan Perkin2010-03-231-3/+3
| | |
| | * Try some more RPM fixes.Jonathan Perkin2010-03-231-3/+7
| | |
| | * Fix RPM prefix.Jonathan Perkin2010-03-221-1/+1
| | |
| | * Set CPACK_PACKAGE_CONTACT, required for .debJonathan Perkin2010-03-221-0/+1
| | |
| | * Attempt to fix RPM support-files directory.Jonathan Perkin2010-03-221-1/+1
| | |
| | * Tidy.Jonathan Perkin2010-03-221-98/+101
| | |
| | * Fix syntax.Jonathan Perkin2010-03-191-0/+1
| | |
| | * First cut at SVR4 layout.Jonathan Perkin2010-03-191-1/+22
| | |
| | * Fixes from wladJonathan Perkin2010-03-181-2/+6
| | |
| * | Fix a couple fo things replated to MSIVladislav Vaintroub2010-02-161-1/+6
| | |
| * | Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-105-17/+106
| | |
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-081-1/+1
| | |
* | | 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. 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 as a comment for now, so that it can be re-activated should the need arise. In addition, set "HAVE_BROKEN_REALPATH" to completely mirror 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. This definitely holds for FreeBSD version 6 and up. Adapt the informational messages to the path taken.
* | | manual merge from mysql-trunk-bugfixingJon Olav Hauglid2010-05-185-92/+223
|\ \ \
| * | | Changes to build using CMake according to existing release packages:Jonathan Perkin2010-05-125-92/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update/fix file layouts for each package type, add new types for native package formats including deb, rpm and svr4. - Build all plugins, including debug versions - Update compiler flags to match current release - Add missing @VAR@ expansions - Install correct mysqclient library symlinks - Fix icc/ia64 builds - Fix install of libmysqld-debug - Don't include mysql_embedded - Remove unpackaged manual pages to avoid missing files warnings - Don't install mtr's test suite
* | | | Committing on behalf of Valdislav Vaintroub (reviewed andKonstantin Osipov2010-05-142-0/+27
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | approved): 3161 Vladislav Vaintroub 2010-04-29 Bug#53196 : CMake builds don't support 'make tags' and 'make ctags' targets. - Added tags and ctags targets CMakeLists.txt: Add tags and ctags targets. cmake/Makefile.am: Add a cmake file to build tags. cmake/tags.cmake: Build tags and ctags.
* | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-211-9/+3
| | | | | | | | | | | | | | | Removing traces of mysql_priv.h from comments and other non-source files that were missed before.
* | | Bug #52149 - packaging differences in CMake buildVladislav Vaintroub2010-03-172-9/+8
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected some packaging bugs: - install mysqlservices library - install libmysqlclient_r.so.{16,16.0.0} as links to libmysqlclient.so - install libmysqld-debug.a - install my_safe_process, my_safe_kill and symlinks to mysql-test-run.pl (mtr, mysql-test-run) into correct place ${INSTALL_MYSQLTESTDIR} cmake/install_layout.cmake: Fix typo cmake/install_macros.cmake: Refactor INSTALL_SYMLINK to allow arbitrary symlink paths. Old version of this macro would make link extension the same as in target. This was not sufficient in some scenarios (would not allow for example libmysqlclient_r.so.16=>./libmysqlclient.so link) libmysql/CMakeLists.txt: Install extra symlinks to libmysqlclient.so (libmysqlclient_r.so.16 and libmysqlclient_r.so.16.0.0) for backward compatiblity. libmysqld/CMakeLists.txt: install libmysqld-debug.a libservices/CMakeLists.txt: install mysqlservices library mysql-test/lib/My/SafeProcess/CMakeLists.txt: install my_safe_process, my_safe_kill into correct place
* | Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P)Vladislav Vaintroub2010-03-082-4/+4
| |
* | mergeVladislav Vaintroub2010-03-032-0/+11
|\ \
View Lorry Controller Status