summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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.