summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2017-07-052-2/+7
|\
| * 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
| | | | * 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
| |/ / /
* | | | MDEV-12938 Discrepancy between mysql_config and mariadb_configSergei Golubchik2017-07-051-2/+2
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-06-081-1/+0
|\ \ \ \ | |/ / /
| * | | 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
* | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | fix "cmake -DWITH_PCRE=bundled"Sergei Golubchik2017-04-211-1/+1
* | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-063-2/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-283-9/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| * | | | | 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
* | | | | | Fix building aws_key_management on LinuxVladislav Vaintroub2017-04-061-3/+0
* | | | | | Merge branch '10.1' into 10.2Vladislav Vaintroub2017-04-061-5/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Do not link client plugins to mysqldVladislav Vaintroub2017-04-061-5/+7
* | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-061-1/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | Windows, compiling : Remove _DEBUG preprocessor constant, to fixVladislav Vaintroub2017-04-041-0/+5
* | | | | | Allow to specify C runtime library used for compilation.Vladislav Vaintroub2017-04-021-8/+21
* | | | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-3111-207/+44
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-03-305-3/+39
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
| | | | * | MDEV-12207 Include windows compatibility manifest into executable to make Get...Vladislav Vaintroub2017-03-082-0/+30
| | * | | | small plugin API related fixesSergei Golubchik2017-03-101-2/+5
| | * | | | MDEV-11520 after-merge fix for 10.1: Use sparse files.Marko Mäkelä2017-02-221-1/+1
| | * | | | There's no systemd socket activation support yetSergey Vojtovich2017-02-171-1/+1
| * | | | | cleanup: innodb files in cmake/Sergei Golubchik2017-03-295-202/+0
| * | | | | MDEV-12328, attempt to fix windows packagingVladislav Vaintroub2017-03-261-1/+1