summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2018-11-061-1/+1
|\
| * Merge 10.2 into 10.3Marko Mäkelä2018-11-061-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | main.derived_cond_pushdown: Move all 10.3 tests to the end, trim trailing white space, and add an "End of 10.3 tests" marker. Add --sorted_result to tests where the ordering is not deterministic. main.win_percentile: Add --sorted_result to tests where the ordering is no longer deterministic.
| | * Merge 10.1 into 10.2Marko Mäkelä2018-11-061-1/+1
| | |\
| | | * Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-1/+1
| | | |\
| | | | * Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-1/+1
| | | | |\
| | | | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-231-1/+1
| | | | | |\
| | | | | | * Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIESAditya A2018-07-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrading the zlib lib to 1.2.11
| | | | | | * Bug #25436469: BUILDS ARE NOT REPRODUCIBLETor Didriksen2017-05-161-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport to 5.5 Current MySQL builds, even on Pushbuild, are not reproducible; they return different results depending on which directory they are built from (and Pushbuild uses several different directories). This is because absolute paths leak into debug information, and even worse, __FILE__. The latter moves code around enough that we've actually seen sysbench changes on the order of 4% in some tests. CMake seemingly insists on using absolute paths, but we can insert our own layer between CMake and GCC to relativize all paths. Also give the right flags to get debug information reproducible and turn off build stamping. This makes the mysqld build 100% bit-for-bit reproducible between runs on my machine, even when run from different directories.
* | | | | | | Enable C++11Sergey Vojtovich2018-09-091-0/+8
|/ / / / / /
* | | | | | cmake .git warningSergei Golubchik2018-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | only run git if .git exists, don't do it for source tarballs
* | | | | | MDEV-16662 CMake warnings: CMP0045Sergei Golubchik2018-08-121-3/+0
| | | | | |
* | | | | | MDEV-16662 CMake warnings: CMP0042Sergei Golubchik2018-08-121-3/+0
| | | | | |
* | | | | | MDEV-16662 CMake warnings: CMP0026Sergei Golubchik2018-08-121-9/+5
| | | | | |
* | | | | | MDEV-16662 CMake warnings: CMP0022Sergei Golubchik2018-08-121-4/+2
| | | | | |
* | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-08-031-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-021-0/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-251-0/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helperSergei Golubchik2018-07-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't install server files if WITHOUT_SERVER is specified. "Server files" are defined as files going into the MariaDB-Server RPM, that is files in the components Server, ManPagesServer, Server_Scripts, IniFiles, SuportFiles, and Readme.
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-06-211-4/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '5.5' into 10.0Sergei Golubchik2018-06-211-4/+0
| | | |\ \ \ | | | | |/ /
| | | | * | Revert "MDEV-16075: Workaround to run MTR test suite for make test"Sergei Golubchik2018-06-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d39629f01ebdd5b89186e6c8a4a8d3dd528bd26a. Because running mtr for many hours with no output whatsoever is not really what we should do. And in 5.5 `make test` just works anyway, nothing to fix here.
| | * | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-0/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-101-0/+4
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-16075: Workaround to run MTR test suite for make testTeodor Mircea Ionita2018-06-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assign all tests added via MY_ADD_TEST to a bogus default_ignore target, so that they are not ran by default when doing bare make test. Add default test named MTR that calls mysql-test-run suite, which is now the single test run by make test. In consequence, modified unit/suite.pm to exclude the MTR test and run the real ctests flagged for default_ignore target, thus no circular loop.
* | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fix debian packaging for tokudbSergei Golubchik2018-06-241-1/+1
| | | | | |
* | | | | | MDEV-16478: mysql_real_connect() from libmariadbd.so always crashOleksandr Byelkin2018-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returned accidentally removed undefinition of MYSQL_SERVER in net_serv.cc inside embedded server (embedded server uses real_net_read/write only as a client) Prevented attempt to clean up embedded server if it was not initialized
* | | | | | Make MariaDB CRC32-lib platform independence (#780)Yuqi2018-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make mariadb crc32 lib platform independent It looks strange that someone can make use of 2 crc libraries (Power64 or AArch64) at the same time. The patch sets macros 'CRC32_LIBRARY' to make platform independence as an optional crc32 library. Change-Id: I68bbf73cafb6a12f7fb105ad57d117b114a8c4af Signed-off-by: Yuqi Gu <yuqi.gu@arm.com>
* | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / /