summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-09-232-3/+2
|\
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-09-221-0/+0
| |\
| | * Merge branch '10.0' into 10.1Sergei Golubchik2017-09-211-0/+0
| | |\
| | | * remove an empty file with a wrong nameSergei Golubchik2017-09-201-0/+0
| * | | CMake : Do not use FindPkgConfig on WindowsVladislav Vaintroub2017-09-211-3/+2
* | | | MDEV-12583 : Bake the git hash into the binaries.Vladislav Vaintroub2017-09-211-0/+3
* | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-206-53/+64
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-195-48/+57
| |\ \ \ | | |/ /
| | * | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-195-48/+57
| | |\ \ | | | |/
| | | * Build improvements and cleanups.Vladislav Vaintroub2017-09-085-48/+58
| * | | cleanupSergei Golubchik2017-09-181-2/+2
| * | | bugfix: don't overwrite tokudb.cnf during the buildSergei Golubchik2017-09-181-3/+5
* | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-014-9/+6
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2017-08-311-1/+1
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1Jan Lindström2017-08-291-1/+1
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-1/+1
| | | |\ \
| | | | * | MW-383 Bumped wsrep patch versionTeemu Ollakka2017-08-141-1/+1
| | | | * | Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-092-4/+10
| | | | |\ \
| | | | * \ \ Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-306-4/+43
| | | | |\ \ \
| * | | | | | | One more attempt to fix dependencies with mysqld import/export librariesVladislav Vaintroub2017-08-301-4/+0
| * | | | | | | submodules.cmake: git returns 128 if not in a repositoryDaniel Black2017-08-291-2/+3
| * | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-08-291-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-08-281-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Windows compile : make compilation fail on "uninitialized variable used" warn...Vladislav Vaintroub2017-08-241-2/+2
| | | | |_|/ | | | |/| |
* | | | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-254-19/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-172-5/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | allow OpenSSL 0.9.8 againSergei Golubchik2017-08-131-1/+1
| | * | | | 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
| | | | | * | | Bug#25611609 LINK WITH DYNAMIC RUNTIME LIBRARIES ON WINDOWSTor Didriksen2017-02-271-2/+5
| | | | | * | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BEArun Kuruvila2016-09-281-8/+248
| | | | | * | | Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-072-4/+5
| | * | | | | | disallow invalid values for WITH_SYSTEMD cmake variable.Sergei Golubchik2017-08-081-1/+3
| * | | | | | | cmake: update submodules automatically during the buildSergei Golubchik2017-08-142-14/+30
* | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-073-4/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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