summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-12924 No --innodb-numa-interleave in mysqld binariesSachin Setiya2018-04-191-0/+3
| | | | | | | | | | It changes the cmake WITH_NUMA option to have 3 values Auto:- If libnuma present compile with numa (Default value) OFF:- Compile without libnuma On:- Compile with numa , throw error if libnuma not present Patch Contributer:- Vesa Patch Reviewer:- serg
* Merge 10.2 into 10.3Marko Mäkelä2018-04-041-7/+1
|\
| * CMake : Move INNODB_DISALLOW_WRITES from top-level CMakeLists.txt to innodbVladislav Vaintroub2018-04-011-7/+1
| |
* | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2018-02-231-0/+1
|\ \
| * \ Merge branch '10.2' into bb-10.2-extSergei Golubchik2018-02-221-0/+1
| |\ \ | | |/
| | * Merge branch '10.1' into 10.2Sergei Golubchik2018-02-221-0/+1
| | |\
| | | * MDEV-14541 - Workaround GCC ICE on ARM64Sergey Vojtovich2018-02-191-0/+1
| | | | | | | | | | | | | | | | Added missing include.
* | | | Make possible to use clang on Windows (clang-cl)Vladislav Vaintroub2018-02-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | -DWITH_ASAN can be used as well now, on x64 Fix many clang-cl warnings.
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-2/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-081-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-2/+2
| | |\ \ | | | |/
| | | * compiler warning (signed/unsigned comparison)Sergei Golubchik2018-02-021-2/+2
| | | |
* | | | Remove capture_warnings.sh and print_warnings.cmakeSergei Golubchik2017-12-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a separate feature, unrelated to system versioning We may keep it or not, but either way, it's a separate discussion, if we keep it, it won't be in the system versioning branch
* | | | System Versioning pre0.12Aleksey Midenkov2017-11-071-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/archive/2017-10-17' into 10.3
| * | | | Scripts: print warnings fixesAleksey Midenkov2017-05-051-13/+1
| | | | |
| * | | | Scripts: collect and reprint warningsKosov Eugene2017-05-051-0/+14
| | | | | | | | | | | | | | | | | | | | Closes #73
| * | | | IB: 0.2 part IIAleksey Midenkov2017-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * moved vers_notify_vtq() to commit phase; * low_level insert (load test passed); * rest of SYS_VTQ columns filled: COMMIT_TS, CONCURR_TRX; * savepoints support; * I_S.INNODB_SYS_VTQ adjustments: - limit to I_S_SYS_VTQ_LIMIT(10000) of most recent records; - CONCURR_TRX limit to I_S_MAX_CONCURR_TRX(100) with '...' truncation marker; - TIMESTAMP fields show fractions of seconds.
| * | | | Scripts: WITH_INNOBASE_STORAGE_ENGINE fix 2 ↵Aleksey Midenkov2017-05-051-5/+4
| | | | | | | | | | | | | | | | | | | | (590af2a4fda6e76b12b58b514099af408dcc40df)
| * | | | Scripts: WITH_INNOBASE_STORAGE_ENGINE fixAleksey Midenkov2017-05-051-0/+9
| | | | |
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-251-2/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | cleanup: remove a duplicate check for GIT_EXECUTABLESergei Golubchik2017-09-231-2/+3
| | | | |
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-09-231-0/+17
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-12583 : Bake the git hash into the binaries.Vladislav Vaintroub2017-09-211-0/+17
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Added version_source_revision server "variable", for the git revision. Also , mysql -V will show git revision. "make dist" will now pack source_revision.h into the source package.
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-211-0/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-191-0/+6
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-191-0/+6
| | |\ \
| | | * | Build improvements and cleanups.Vladislav Vaintroub2017-09-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - the probably ultimate fix for dependencies on VS - remove some GET_TARGET_PROPERTY(LOCATION ...), they are deprecated in cmake 3.9 - simplify signing targets on Windows. - remove INSTALL_DEBUG_TARGET, we do not mix binaries from different builds in the same package
* | | | | add TSAN option to cmake (#444)Eugene Kosov2017-09-151-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add TSAN option to cmake * disable security hardened build when TSAN is on * handling user-specified SECURITY_HARDEDED option
* | | | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2017-08-261-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | don't install same files twiceSergei Golubchik2017-08-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeLists.txt - merge mistake, apparently include/CMakeLists.txt - install from CMAKE_CURRENT_BINARY_DIR. Only install from CMAKE_CURRENT_SOURCE_DIR, if it's different from CMAKE_CURRENT_BINARY_DIR mysql-test/CMakeLists.txt - INSTALL_MYSQL_TEST() macro installs everything, no need to install mtr separately once again mysql-test/lib/My/SafeProcess/CMakeLists.txt MYSQL_ADD_EXECUTABLE includes INSTALL sql-bench/CMakeLists.txt list files explicitly. don't install garbage, don't process 'foo' and 'foo.sh' separately, it's only one file to install, not two.
| * | | | cmake: update submodules automatically during the buildSergei Golubchik2017-08-141-1/+1
| | | | |
* | | | | Added DBUG_ASSERT_AS_PRINTF compile flagMonty2017-08-241-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If compiling a non DBUG binary with -DDBUG_ASSERT_AS_PRINTF asserts will be changed to printf + stack trace (of stack trace are enabled). - Changed #ifndef DBUG_OFF to #ifdef DBUG_ASSERT_EXISTS for those DBUG_OFF that was just used to enable assert - Assert checking that could greatly impact performance where changed to DBUG_ASSERT_SLOW which is not affected by DBUG_ASSERT_AS_PRINTF - Added one extra option to my_print_stacktrace() to get more silent in case of stack trace printing as part of assert.
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-7/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Revert commit db0917f68f, because the fix for MDEV-12696 is coming from 5.5 and 10.1 in this merge.
| * | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-7/+5
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-8/+5
| | |\
| | | * Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-111-8/+5
| | | |\
| | | | * Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ONTor Didriksen2017-01-171-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post-push fix. Problem cmake without explicit build type was broken on windows. Fix: do not test for build type, always extend CMAKE_C[XX]_FLAGS_DEBUG
| | | | * Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ONTor Didriksen2017-01-171-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The combination cmake -DENABLE_DEBUG_SYNC=0 -DWITH_DEBUG=ON fails to build. Fix: Remove option ENABLE_DEBUG_SYNC.
| | | | * Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-071-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem Statement ========= Fix various issues when building MySQL with Visual Studio 2015. Fix: ======= - Visual Studio 2015 adds support for timespec. Add check and related code to use this and only use our replacement if timespec is not defined. - Rename lfind/lsearch to my* to avoid redefinition problems. - Set default value for TMPDIR to "" on Windows as P_tmpdir no longer exists. - using VS definition of snprintf if available - tzname are now renamed to _tzname.
| | | | * Updated CMakeLists.txt to include rpm-docker directoryBalasubramanian Kandasamy2015-06-161-1/+2
| | | | |
* | | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-311-4/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-1/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-211-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '5.5' into 10.0Sergei Golubchik2017-03-211-2/+1
| | | |\ \ \ | | | | |/ /
| | | | * | remove COPYING.LESSERSergei Golubchik2017-03-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | shouldn't have been added in the first place, MariaDB Server is GPLv2
| | * | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-0/+3
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, implement MDEV-11027 a little differently from 5.5 and 10.0: recv_apply_hashed_log_recs(): Change the return type back to void (DB_SUCCESS was always returned). Report progress also via systemd using sd_notifyf().
| | | * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-0/+3
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release ↵Sergei Golubchik2017-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -DCMAKE_BUILD_TYPE=Debug It's too plainful to require <my_config.h> to be included first for third-party storage engines. And anyway, some source files might not include <my_config.h> at all, so there is no guarantee that all parts of the binary will see identical definitions of system structures (e.g. struct stat). Define _FILE_OFFSET_BITS on the compiler's command line instead.
| | | | * | Fix warnings on Windows, compiler option -ggdb3 option is nonexistentVladislav Vaintroub2016-05-241-2/+4
| | | | | |
| * | | | | MDEV-11059 don't build the server with jemallocSergei Golubchik2017-03-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't build the server with jemalloc. only build tokudb with it. move tokudb into a separate package, because it brings a new dependency
View Lorry Controller Status