summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.0 into 10.1Marko Mäkelä2017-08-281-2/+2
|\
| * Windows compile : make compilation fail on "uninitialized variable used" ↵Vladislav Vaintroub2017-08-241-2/+2
| | | | | | | | | | | | | | warning C4700 This is a genuine error, and will crash debug buildd in runtime checks if not fixed. it is better to fail during compile.
* | allow OpenSSL 0.9.8 againSergei Golubchik2017-08-131-1/+1
| | | | | | | | | | | | | | this disables the check, added in d937916c06 Applications shouldn't police OpenSSL versions that users are using. And 0.9.8 on Mac OS X seems to have new fixes, despite being "0.9.8"
* | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-3/+4
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-251-3/+4
| |\
| | * Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2017-07-181-3/+4
| | |\
| | | * Bug#25942414: SSL VARIABLES USAGE WHEN LIBMYSQL IS COMPILED WITH WITH_SSL=NOHarin Vadodaria2017-04-272-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description: If libmysql is compiled with WITH_SSL=NO, --ssl-* are not useful. Solution: 1. Restricted WITH_SSL to values : bundled | yes | system 2. Made "bundled" as default value for WITH_SSL. Also, not specifying WITH_SSL or even specifying WITH_SSL=no will be treated as/converted to WITH_SSL=bundled. Reviewed-By: Tor Didriksen <tor.didriksen@oracle.com> Reviewed-By: Georgi Kodinov <georgi.kodinov@oracle.com>
| | | * Bug#25611609 LINK WITH DYNAMIC RUNTIME LIBRARIES ON WINDOWSTor Didriksen2017-02-271-2/+5
| | | | | | | | | | | | | | | | | | | | Patch for 5.5 and 5.6 Use default runtime libraries on windows, i.e. build with /MD
| | | * Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BEArun Kuruvila2016-09-281-8/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RESTRICTED IN ALL GA RELEASES Back port of WL#6782 to 5.5 and 5.6. This also includes back port of Bug#20771331, Bug#20741572 and Bug#20770671. Bug#24695274 and Bug#24679907 are also handled along with this.
| | | * Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-072-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | disallow invalid values for WITH_SYSTEMD cmake variable.Sergei Golubchik2017-08-081-1/+3
| | | |
* | | | Merge branch 'bb-10.1-vicentiu' into 10.1Vicențiu Ciorbaru2017-06-271-1/+6
|\ \ \ \
| * \ \ \ Merge remote-tracking branch '10.0' into 10.1Vicențiu Ciorbaru2017-06-211-1/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2017-06-201-1/+6
| | |\ \ \ | | | |/ /
| | | * | MDEV-4646 No mysqld-debug or debuginfo in MariaDB-Server RPMSergei Golubchik2017-06-181-0/+1
| | | | |
| | | * | Use CPACK_RPM_FILE_NAME="RPM-DEFAULT"Daniel Black2017-06-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been implemented in for cmake-3.6 to match distro version of what the filename should look like. Thanks to Domen Vranka for the suggestion.
| | | * | Attempt to fix strange rpm dependency issue following prior patchKristian Nielsen2017-04-201-0/+3
| | | | |
* | | | | MDEV-12193 Discontinue support of unsecure and unsupported OpenSSL versions ↵Sergei Golubchik2017-06-221-11/+12
|/ / / / | | | | | | | | | | | | (< 1.0.1)
* | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2017-05-261-1/+0
|\ \ \ \
| * | | | Bump WSREP_PATCH_VERSION to 19Philip Stoev2017-03-151-1/+1
| | | | |
| * | | | Bump WSREP_PATCH_VERSION to 18Philip Stoev2017-03-141-1/+1
| | | | |
| * | | | Bump WSREP_PATCH_VERSION to 17Philip Stoev2017-03-121-1/+1
| | | | |
| * | | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-133-1/+3
| |\ \ \ \
* | | | | | MDEV-12593: InnoDB page compression should use lz4_compress_default ifJan Lindström2017-05-181-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available lz4.cmake: Check if shared or static lz4 library has LZ4_compress_default function and if it has define HAVE_LZ4_COMPRESS_DEFAULT. fil_compress_page: If HAVE_LZ4_COMPRESS_DEFAULT is defined use LZ4_compress_default function for compression if not use LZ4_compress_limitedOutput function. Introduced a innodb-page-compression.inc file for page compression tests that will also search .ibd file to verify that pages are compressed (i.e. used search string is not found). Modified page compression tests to use this file. Note that snappy method is not included because of MDEV-12615 InnoDB page compression method snappy mostly does not compress pages that will be fixed on different commit.
* | | | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | fix "cmake -DWITH_PCRE=bundled"Sergei Golubchik2017-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | after building with system
* | | | | | MDEV-9566 build mariabackup with libarchive for releaseVladislav Vaintroub2017-04-271-0/+4
| | | | | |
* | | | | | MDEV-9566 MariaBackup packagingVladislav Vaintroub2017-04-271-1/+6
| | | | | |
* | | | | | MDEV-11660 Make encryption plugins "pure"Vladislav Vaintroub2017-04-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not exporting mysqld entry points directly. This is needed for mariabackup, to load encryption plugins on Windows. All plugins are "pure" by default. To mark plugin "impure" it should use RECOMPILE_FOR_EMBEDDED or STORAGE_ENGINE keyword.
* | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-04-211-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Don't use full path of libtoolDaniel Black2017-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be friendly to our OSX users where the libtool path is very different. Ref: * https://github.com/Homebrew/homebrew-core/blob/master/Formula/mariadb.rb#L44..L46
* | | | | | OSX: get cache line sizeDaniel Black2017-04-201-7/+21
| | | | | |
* | | | | | Bump WSREP_PATCH_VERSION to 19Philip Stoev2017-04-061-1/+1
| | | | | |
* | | | | | Bump WSREP_PATCH_VERSION to 18Philip Stoev2017-04-061-1/+1
| | | | | |
* | | | | | Bump WSREP_PATCH_VERSION to 17Philip Stoev2017-04-061-1/+1
| | | | | |
* | | | | | Do not link client plugins to mysqldVladislav Vaintroub2017-04-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | they might not be able to load after this.
* | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-04-061-1/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Compiling, Windows . Avoid unnecessary rebuilds with MSVC.Vladislav Vaintroub2017-04-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To export symbols from the mysqld.exe, use lib.exe with /DEF, rather than pre-link step when building mysqld.exe. This helps to avoid relinking all plugins, if mysqld.exe was recompiled but the list of its exports has not changed. Also removed unnecessary DEPENDS in some ADD_CUSTOM_COMMAND (gen_lex_token, gen_lex_hash etc). They confuse VS generator which tends to recreate headers and do unnecessary recompilations.
* | | | | | disable innodb snappy for release buildsSergei Golubchik2017-03-291-0/+1
| | | | | |
* | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-213-0/+32
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-03-213-0/+32
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | MDEV-12231 MariaDB fails to restart after 10.0.30-1.el7 updateSergei Golubchik2017-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | force SELinux policies to be built in mysql_release RPM packages
| | * | | MDEV-12207 Include windows compatibility manifest into executable to make ↵Vladislav Vaintroub2017-03-082-0/+30
| | | | | | | | | | | | | | | | | | | | GetVersionEx work correctly
* | | | | small plugin API related fixesSergei Golubchik2017-03-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * define MYSQL_DYNAMIC_PLUGIN only for server plugins * don't typedef my_bool in mysql.h if plugin.h has already done it * fix the include guard in plugin.h
* | | | | MDEV-11520 after-merge fix for 10.1: Use sparse files.Marko Mäkelä2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If page_compression (introduced in MariaDB Server 10.1) is enabled, the logical action is to not preallocate space to the data files, but to only logically extend the files with zeroes. fil_create_new_single_table_tablespace(): Create smaller files for ROW_FORMAT=COMPRESSED tables, but adhere to the minimum file size of 4*innodb_page_size. fil_space_extend_must_retry(), os_file_set_size(): On Windows, use SetFileInformationByHandle() and FILE_END_OF_FILE_INFO, which depends on bumping _WIN32_WINNT to 0x0600. FIXME: The files are not yet set up as sparse, so this will currently end up physically extending (preallocating) the files, wasting storage for unused pages. os_file_set_size(): Add the parameter "bool sparse=false" to declare that the file is to be extended logically, instead of being preallocated. The only caller with sparse=true is fil_create_new_single_table_tablespace(). (The system tablespace cannot be created with page_compression.) fil_space_extend_must_retry(), os_file_set_size(): Outside Windows, use ftruncate() to extend files that are supposed to be sparse. On systems where ftruncate() is limited to files less than 4GiB (if there are any), fil_space_extend_must_retry() retains the old logic of physically extending the file.
* | | | | There's no systemd socket activation support yetSergey Vojtovich2017-02-171-1/+1
| | | | |
* | | | | Fix broken cmake -DBUILD_CONFIG=mysql_release on Windows.mariadb-10.1.20Vladislav Vaintroub2016-12-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | mysql_release.cmake set WITH_JEMALLOC=static, which makes windows builds fail since there is no jemalloc either static or shared there
* | | | | MDEV-10954: MariaDB Galera: wsrep_sst_common: line 120: which: command not foundNirbhay Choubey2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | Add 'which' to REQUIRES list.
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-113-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-093-1/+3
| |\ \ \ \ | | |/ / /