summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* merge with mysql-5.5.21Sergei Golubchik2012-03-091-1/+13
|\
| * 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.
* | Merge MWL#192: non-blocking client library into MariaDB.unknown2012-02-261-1/+1
|\ \
| * \ Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-211-1/+1
| |\ \
* | | | disable safemalloc for valgrind builds.Sergei Golubchik2012-02-231-1/+1
|/ / / | | | | | | | | | | | | | | | always try to use valgrind headers in debug builds. define HAVE_valgrind for --with-valgrind fix valgrind check in my_valgrind.h
* | | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ \
| * \ \ Merge with 5.2.Michael Widenius2011-12-111-1/+2
| |\ \ \ | | | | | | | | | | | | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
| | * \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-1/+2
| | |\ \ \
| | | * \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-1/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed up copyright messages.
| | | | * \ \ Updated/added copyright headersKent Boortz2011-07-031-1/+2
| | | | |\ \ \
| | | | * \ \ \ 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.
| * | | | | | | | mergeVladislav Vaintroub2011-10-121-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Add option to enable feedback plugin to the MSI installer.Vladislav Vaintroub2011-10-121-0/+2
| | | | | | | | |
| * | | | | | | | mergeVladislav Vaintroub2011-10-111-3/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | mergeVladislav Vaintroub2011-10-111-3/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | remove unconditional SAFEMALLOC/SAFEMUTEX from debug flagsVladislav Vaintroub2011-10-111-3/+0
| | | | | | | | |
| * | | | | | | | mergeSergei Golubchik2011-10-111-21/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | merge with 5.1Sergei Golubchik2011-10-071-21/+27
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | support for plugins on windowsSergei Golubchik2011-10-041-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeLists.txt: 1. add -DSAFEMALLOC -DSAFE_MUTEX in the top-level CMakeLists.txt don't force plugins to copy-paste these lines in their CMakeLists.txt 2.1 search plugin/* for plugins (not only storage/*), 2.2 recognize MYSQL_PLUGIN (not only MYSQL_STORAGE_ENGINE), 2.3 extract library names from the plug.in (don't force library names to be ha_<engine>.dll and <engine>.lib) include/mysql/plugin.h: define MYSQL_PLUGIN_EXPORT appropriately (backport from 5.5) libmysqld/CMakeLists.txt: remove unnecessary workaround plugin/fulltext/CMakeLists.txt: build fulltext example plugin on windows storage/maria/CMakeLists.txt: The library is called libmaria_s.lib, not maria.lib storage/maria/unittest/CMakeLists.txt: The library is called libmaria_s.lib, not maria.lib storage/myisam/CMakeLists.txt: The library is called libmyisam_s.lib, not myisam.lib storage/mysql_storage_engine.cmake: introduce MYSQL_PLUGIN macro. don't force library names to be ha_<engine>.dll and <engine>.lib storage/xtradb/CMakeLists.txt: remove a condition from include win/README: don't use deprecated syntax win/configure-mariadb.sh: don't use deprecated syntax win/configure.js: 1. support MYSQL_PLUGIN in addition to MYSQL_STORAGE_ENGINE. 2. support plugin/* in addition to storage/*
| | | * | | | | Windows build : Make win\config.js optional in 5.1Vladislav Vaintroub2011-05-121-1/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies handling 5.1 in buildbot.
* | | | | | | | * remove WITH_DEBUG from CMakeLists.txtSergei Golubchik2011-12-151-79/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MYSQL_MAINTAINER_MODE and SAFEMALLOC take values ON/OFF/AUTO (in all builds, in none, only in debug and platform dependent) * ./configure prefers RelWithDebInfo unless the user overrides
* | | | | | | | new configure option: NOT_FOR_DISTRIBUTIONSergei Golubchik2011-12-141-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix safemalloc to compile w/o libbfd. CMakeLists.txt: NOT_FOR_DISTRIBUTION option cmake/readline.cmake: simplify libedit/readline detection. never use bundled libedit. use system readline v6 only if NOT_FOR_DISTRIBUTION=1 configure.cmake: use libbfd only if NOT_FOR_DISTRIBUTION=1 include/my_stacktrace.h: link with libbfd even w/o safemalloc.
* | | | | | | | Fix build and packaging on Windows:Vladislav Vaintroub2011-11-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - build executables we have in 5.3 (mysql_install_db.exe, mysq_upgrade_service.exe, upgrade wizard), and MSI - add some missing headers to windows specific source files. This needs to be done since 5.5 is using WIN32_LEAN_AND_MEAN preprocessor constant thus windows.h no more includes whiole Windows - do not deliver perl scripts (mysql_install_db.pl & friends) -they do not work, are not documented, and we have native executables for this functionality. do not pack echo.exe, replace.exe into MSI, they are not needed. Do not build resolveip on Windows, it is not used. - precache results of of system checks in cmake/os/WindowsCache.cmake (like it is alreay done for majority of tests to speed up cmake run with VS) - make feedback plugin DEFAULT on Windows (so MSI works if user enables plugin), fix null pointer access in PSI_register
* | | | | | | | build on windowsSergei Golubchik2011-11-021-6/+1
| | | | | | | |
* | | | | | | | Fix debug build on Windows. Vladislav Vaintroub2011-10-251-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for WITH_DEBUG does not work, as described in CMake MySQL wiki http://forge.mysql.com/wiki/CMake#Debug-only_options Excluding directory completely for certain build types works for Makefiles only, but not for Visual Studio and not for Xcode.
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
| * | | | | | | merge Windows performance patches into 5.3Vladislav Vaintroub2011-07-051-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix XtraDB LPBug #714143 : Vladislav Vaintroub2011-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows native async io is disabled. The patch uses completion ports for asynchronous IO notification , instead of formerly used notification via event . This also removes the limit of 64 async IOs per background IO thread (this limit was forced by using WaitForMultipleObjects in previous AIO implementation)
| * | | | | | | Fiix LPBUG#798629Vladislav Vaintroub2011-06-171-3/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define USE_MARIA_FOR_TMP_TABLES preprocessor constant by default if Aria engine is compiled in. Use CMake variable WITH_ARIA_TMP_TABLES to control the temp table engine setting.
| * | | | | | Small CMake fixes :Vladislav Vaintroub2011-05-151-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add version info for the client library, dynamic plugins and some utilities - do not recompile client library sources 3 times (for mysqlclient , mysqlclient_notls and libmysql) One time is sufficient, so get rid of mysqlclient_notls, and link static client library to the shared. - remove incremental linking flag
| * | | | | | fix noisy warnings in header filesVladislav Vaintroub2011-05-041-1/+0
| | | | | | |
| * | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | Moved some BSD string functions from Unireg
| | | * | | | fixing 38697/11749301MySQL Build Team2011-03-211-0/+1
| | | |/ / /
| * | | | | merge 5.2Vladislav Vaintroub2011-03-101-2/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-2/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-2/+1
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
| * | | | | | On Philips request, introduce a variableVladislav Vaintroub2011-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD_RELEASE to disable graceful fallbacks if WiX or MFC is not available.
| * | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-136/+73
| |/ / / / / | | | | | | | | | | | | | | | | | | to be able to build MSI based installer
| * | | | | mergeVladislav Vaintroub2010-12-061-0/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: inconsistent compilation, federatedx is compiled without SAFEMALLOC flag, while anything else is compiled with SAFEMALLOC. As a consequence, my_hash_init used inside federatedx initialization does not provide correct caller info parameters (file, line) , so they are initialized with whatever is on stack. When info about allocated memory is output in COM_DEBUG command, the server crashes trying to output string starting at 0xcccccccccccccccc. The fix is to remove SAFEMALLOC preprocessor flags from every CMakeLists.txt, except the top-level one. Also, SAFEMALLOC is not defined by default now, instead there is WITH_DEBUG_FULL CMake option which adds -DSAFEMALLOC to C and C++ flags in debug compilation. This option is off by default, because 1) Debug C runtime already has heap debugging builtin with overwrite and leak detection 2)safemalloc considerably slows down the tests. Note also that - SAFEMALLOC is gone in MySQL5.5 - On Windows, heap related overflows can also be found using free pageheap utility (that is also part of application verifier). This is even more efficient if there are no other layers on top of Windows heap allocator, e.g it is most efficient with release version.
| * | | | | Merge with 5.1Michael Widenius2010-12-041-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010). Remove map files from packaging. - Fix warning about ETIMEDOUT being redefined. - Fix warning about FSP_EXTENT_SIZE in xtradb (32/64 bit right shift mismatch) - Silence warnings coming from generated code (flex/bison) in xtradb/innodb_plugin. - Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
| * | | | | rename maria to ariaSergei Golubchik2010-09-121-5/+5
| | | | | |
| * | | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+123
| |\ \ \ \ \ | | |/ / / /
| | * | | | Hardcode the build path for the installer temporarilyBo Thorsen2010-07-011-5/+0
| | | | | |
| | * | | | Fix cpack runBo Thorsen2010-07-011-0/+5
| | | | | |
| | * | | | Install MariaDB as a service with the installerBo Thorsen2010-06-301-0/+3
| | | | | |