summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #253 from grooverdan/10.2-MDEV-11195-numa-buildVladislav Vaintroub2016-11-041-1/+0
|\ | | | | MDEV-11195: Correct enablement of NUMA in innodb/xtradb
| * MDEV-11195: Correct enablement of NUMA in innodb/xtradbDaniel Black2016-11-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No -DHAVE_LIBNUMA=1 was passed to the source compile (and the global include/my_config.h wasn't used). This also is Linux only so corrected the cmake macro. Fixed indenting in cmake macro. Removed NUMA defination from include/my_config.h as its only in the storage engine. Thanks Elena Stepanova and Vladislav Vaintroub for the detailed list of bugs/questions. Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
* | MDEV-6284: Install systemd files (almost) the Debian wayOtto Kekäläinen2016-10-291-6/+0
| | | | | | | | | | | | | | | | The control file contents must be correct from the start and cannot be modified at build time by CMake. Also all static Debian package analyzers will fail to see all manipulations by CMake later on. It is best to do all manipulations like these in autobake-deb.sh.
* | MDEV-6284: Revert commit af03ba84 partially for systemdOtto Kekäläinen2016-10-271-0/+6
| | | | | | | | | | This version of Debian packaging does not yet install systemd scripts, so revert that part to the CMakeLists.txt based hack.
* | MDEV-6284: Remove CMakeLists.txt hack that mangled the server install fileOtto Kekäläinen2016-10-271-6/+0
| | | | | | | | | | | | For Debian the rules file is the main makefile and assuming that a upstream makefile will mangle the Debian packaging files creates false alerts from static analysis tools and other problems.
* | MDEV-6284: Rename .files -> .installOtto Kekäläinen2016-10-271-2/+2
|/
* Merge branch '10.2-numa' of https://github.com/grooverdan/mariadb-server ↵Jan Lindström2016-10-241-0/+1
|\ | | | | | | into grooverdan-10.2-numa
| * Merge 10.2Daniel Black2016-09-231-1/+9
| |\ | | | | | | | | | Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
| * | MDEV-10829: Enable Innodb NUMA interleaveDaniel Black2016-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Code was already existing within the innobase/xtradb storage engines however without this cmake code it was never enabled. num.cmake heavily based off work by Annamalai Gurusami <annamalai.gurusami@oracle.com> Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
* | | MDEV-9143 JSON_xxx functions.Alexey Botchkov2016-10-191-0/+1
| |/ |/| | | | | | | strings/json_lib.c added as a JSON library. SQL frunction added with sql/item_jsonfunc.h/cc
* | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-211-1/+5
|\ \ | |/
| * Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-0/+4
| |\
| | * MDEV-10412 fix WITH_ASAN option for 10.1Rik Prohaska2016-07-241-0/+4
| | |
| * | Markdown README for a prettier github representationDaniel Black2016-08-241-1/+1
| | |
* | | auto-clone C/C, if possibleSergei Golubchik2016-09-121-0/+5
| | |
* | | Add C/C as a submodule in libmariadb/Sergei Golubchik2016-09-121-2/+1
| | | | | | | | | | | | | | | | | | also * fix includes * rename cmake macros and targets to avoid name clashes
* | | Set cmake policy CMP0054 NEWSergei Golubchik2016-09-041-0/+3
| | | | | | | | | | | | meaning in IF("A") cmake will not expand the value of the variable A
* | | MDEV-9293 - Use MariaDB's Connector/C in serverVladislav Vaintroub2016-08-251-0/+1
|/ /
* | Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-191-1/+0
| | | | | | | | This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
* | MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-191-0/+1
| |
* | MDEV-9872 - Add common optimized CRC32 function interfaceSergey Vojtovich2016-08-041-0/+1
| | | | | | | | | | | | | | | | Move crc32-vpmsum to extra. Compile static crc32-vpmsum instead of adding sources directly. Make use of crc32-vpmsum via my_checksum(). Based on contribution by Daniel Black.
* | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-251-9/+8
|\ \ | |/
| * MDEV-9601 Build client plugins, also for the cmake client-only buildVladislav Vaintroub2016-02-221-9/+8
| | | | | | | | (-DWITHOUT_SERVER=1)
* | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-291-1/+1
|\ \ | |/
| * MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute pathsSergey Vojtovich2015-12-221-1/+1
| | | | | | | | Allow absolute paths for INSTALL_*DIR.
* | MDEV-8111 - remove "fast mutexes"Sergey Vojtovich2015-11-261-7/+0
| | | | | | | | | | They aren't faster than normal mutexes. They're disabled by default for years, so de facto it's dead code, never used.
* | cmake: message_onceSergei Golubchik2015-11-231-0/+1
| |
* | cmake: MYSQL_PARSE_ARGUMENTS -> CMAKE_PARSE_ARGUMENTSSergei Golubchik2015-11-231-5/+1
| |
* | cmake: remove unused checks, options, and symbolsSergei Golubchik2015-11-231-8/+0
| |
* | fix debian packaging for 10.2Sergei Golubchik2015-11-231-2/+2
|/
* cleanupSergei Golubchik2015-11-201-1/+0
|
* MDEV-6264: CentOS missing lsof as dependency for MariaDB-server (10.1)Nirbhay Choubey2015-11-201-1/+1
| | | | | | wsrep.cmake should be included before cpack_rpm.cmake as it defines WITH_WSREP, required by cpack_rpm.cmake to conditionally include galera helper tools in server package's requires list.
* MDEV-9021: MYSQLD SEGFAULTS WHEN BUILT USING --WITH-MAX-INDEXES=128Nirbhay Choubey2015-11-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bitmap implementation defines two template Bitmap classes. One optimized for 64-bit (default) wide bitmaps while the other is used for all other widths. In order to optimize the computations, Bitmap<64> class has defined its own member functions for bitmap operations, the other one, however, relies on mysys' bitmap implementation (mysys/my_bitmap.c). Issue 1: In case of non 64-bit Bitmap class, intersect() wrongly reset the received bitmap while initialising a new local bitmap structure (bitmap_init() clears the bitmap buffer) thus, the received bitmap was getting cleared. Fixed by initializing the local bitmap structure by using a temporary buffer and later copying the received bitmap to the initialised bitmap structure. Issue 2: The non 64-bit Bitmap class had the Iterator missing which caused compilation failure. Also added a cmake variable to hold the MAX_INDEXES value when supplied from the command prompt. (eg. cmake .. -DMAX_INDEXES=128U). Checks have been put in place to trigger build failure if MAX_INDEXES value is greater than 128. Test modifications: * Introduced include/have_max_indexes_[64|128].inc to facilitate skipping of tests for which the output differs with different MAX_INDEXES. * Introduced include/max_indexes.inc which would get modified by cmake to reflect the MAX_INDEXES value used to build the server. This file simply sets an mtr variable '$max_indexes' to show the MAX_INDEXES value, which will then be consumed by the above introduced include file. * Some tests (portions), dependent on MAX_INDEXES value, have been moved to separate test files.
* MDEV-427/MDEV-5713 Add systemd script with notify functionalityDaniel Black2015-10-121-0/+3
|
* Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-1/+0
|\ | | | | | | | | referenced_by_foreign_key2(), needed for InnoDB to compile, was taken from 10.0-galera
| * MDEV-8296 MSVS 2013 & WiX 3.9Sergei Golubchik2015-08-011-2/+0
| | | | | | | | removed unused directory
* | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-1/+1
|\ \ | |/
| * perfschema 5.6.24Sergei Golubchik2015-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | including the big commit commit 305130361bf72726de220f3d2b2787395e10be61 Author: Marc Alff <marc.alff@oracle.com> Date: Tue Feb 10 11:31:32 2015 +0100 WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6 (with the following commits) and related changes in sql/
* | remove one cmake MESSAGESergei Golubchik2015-04-051-1/+0
| | | | | | | | | | (one generally should not do that, these messages are printed on every cmake run)
* | MY_CHECK_AND_SET_COMPILER_FLAG changesAlexey Botchkov2015-03-111-7/+1
| | | | | | | | | | * watch for "redefined macro" warning * don't enable -D_FORTIFY_SOURCE=2 in debug builds (it requires -O)
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-2/+8
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-2/+8
| |\
| | * Merge remote-tracking branch 'bzr/5.5' into bb-5.5-mergeSergei Golubchik2015-02-121-0/+5
| | |\
| | | * restore a cross-compiling bit that was lost in a mergeSergei Golubchik2015-02-101-0/+5
| | | |
| | * | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42Sergei Golubchik2015-02-111-2/+3
| | |\ \ | | | |/ | | |/|
| | | * Bug#20136840 REMOVE REMAINING REFERENCES TO BZR IN CMAKE SCRIPTSTor Didriksen2014-12-111-1/+1
| | | | | | | | | | | | | | | | Patch for 5.5
| | | * Bug#19908468 PLACE CORRECT INFORMATION IN INFO_SRC AFTER TRANSITIONING TO GITTor Didriksen2014-11-111-1/+2
| | | | | | | | | | | | | | | | Use 'git log -1; git branch' rather than 'bzr version-info'
| | | * Bug#19890133 MAKE DIST USING BZR EXPORT EVEN FOR SOURCE DIR NOT A BZR REPOTor Didriksen2014-11-111-0/+3
| | | | | | | | | | | | | | | | | | | | For 'make dist': only use 'bzr export' if bzr root == ${CMAKE_SOURCE_DIR} Same thing for git.
| | | * Added sles11 repo packagesBalasubramanian Kandasamy2014-11-041-0/+1
| | | |
| | | * Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-131-39/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE Backport from mysql-5.6 to mysql-5.5
View Lorry Controller Status