summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2013-07-171-2/+3
|\
| * mysql-5.5.32 mergeSergei Golubchik2013-07-161-2/+3
| |\
| | * Bug 16534721 - MYSQL_INSTALL_DB RUNS AGAIN DURING UPGRADE EVEN DATA ↵Murthy Narkedimilli2013-04-031-1/+2
| | | | | | | | | | | | DIRECTORY EXISTS
| | * Placement change:Joerg Bruehe2012-11-071-1/+1
| | | | | | | | | | | | | | | | | | Top level "SPECIFIC-ULN/" was inappropriate, put the files to create RPMs for ULN into "packaging/rpm-uln/".
* | | 5.5 mergeSergei Golubchik2013-06-061-1/+1
|\ \ \ | |/ /
| * | MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even ↵Vladislav Vaintroub2013-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | if there are upgradable instances (i.e windows service of lower MariaDB/MySQL version) The main reason for he error is misplaced ADD_DIRECTORY in top-level CMakeLists.txt. ADD_DIRECTORY(win/packaging) was places before win/upgrade_wizard, and MSI was not able to detect that upgrade wizard was built, and thus excluded upgrade wizard entirely.
* | | 5.5 mergeSergei Golubchik2013-03-271-5/+1
|\ \ \ | |/ /
| * | make rpm packages to respect CMAKE_INSTALL_PREFIXSergei Golubchik2013-02-081-5/+1
| | |
* | | 5.5 mergeSergei Golubchik2013-01-291-0/+2
|\ \ \ | |/ /
| * | mysql-5.5.29 mergeSergei Golubchik2013-01-151-0/+2
| |\ \
| | * | Placement change:Joerg Bruehe2012-11-081-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Top level "SPECIFIC-ULN/" was inappropriate, put the files to create RPMs for ULN into "packaging/rpm-uln/".
| | * Merge changes for ULN RPMs into main 5.5Joerg Bruehe2012-09-211-0/+1
| | |\
| | | * More changes to supporting the build of RPMs for ULNJoerg Bruehe2012-06-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the MySQL 5.5 source tree. Contrary to the comment, the spec file for these ULN RPMs was missing in the previous changeset (blame ".bzrignore"). This change now brings said spec file, and it adds cmake handling for the new files. Still for internal tool tests only, not yet ready for publishing. CMakeLists.txt: Add the subdirectory holding specific stuff for the RedHat-compatible RPMs for ULN. cmake/install_layout.cmake: Explicitly mention my the ULN RPMs are handled.
| | * | Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BREAKS THE BUILDTor Didriksen2012-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore --with-client-ldflags it's not supported by the cmake scripts anyways. Ignore --with-mysqld-ldflags it's only used with --with-mysqld-ldflags=-static and that doesn't work.
* | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-0/+4
|\ \ \ \ | |/ / /
| * | | mysql-5.5.28Sergei Golubchik2012-10-161-0/+4
| |\ \ \ | | |/ /
| | * | upmerge 14035452 5.1 -> 5.5Bjorn Munch2012-07-191-0/+3
| | |\ \ | | | |/ | | |/|
| | | * Bug #14035452 - MODULARIZE MYSQL_CLIENT_TESTBjorn Munch2012-07-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new minimal client using same framework Added internal test using it Small changes to top level make/configure/cmake to have it built
* | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-0/+1
|\ \ \ \
| * \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-0/+4
| | |\ \ \
| | * | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move standalone tests to a unittest. - Added comments.
* | | | | | Automatic merge with 5.5Michael Widenius2012-09-011-9/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-439 cmake -DWITHOUT_SERVER does not workSergei Golubchik2012-08-231-9/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | fix mysys/waiting_threads.c to compile w/o performance schema include clients. scripts and manpages in -DWITHOUT_SERVER
* | | | | automatic merge with 5.5Michael Widenius2012-06-271-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-302 lp:988204 MariaDB 5.5.23 binaries don't use libaioSergei Golubchik2012-06-061-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | simplify debian/dist/*/rules slightly. move hard-coded config value to cmake files. (the actual fix is -DBUILD_CONFIG=mysql_release)
* | | | Switched off Maintainer mode by default as it gave wrong compiler warnings ↵Michael Widenius2012-06-131-6/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (as it added -Wall after some switches was already turned off) cmake/maintainer.cmake: Add -DFORCE_INIT_OF_VARS to not get warnings generated by -Wall configure.cmake: Don't add -Wall if we already have it. This is to not enable options that are already turned off. support-files/compiler_warnings.supp: Removed suppression that is not needed anymore
* | | Building RPMs with CPackSergei Golubchik2012-05-221-48/+26
| | | | | | | | | | | | configure with cmake -DRPM=distro
* | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/innodb/t/group_commit_crash.test: remove autoincrement to avoid rbr being used for insert ... select mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test: remove autoincrement to avoid rbr being used for insert ... select mysys/my_addr_resolve.c: a pointer to a buffer is returned to the caller -> the buffer cannot be on the stack mysys/stacktrace.c: my_vsnprintf() is ok here, in 5.5
| * | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ | | |/
* | | 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
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | |
View Lorry Controller Status