summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* CMake,Windows - cleanup data directory prior to bootstrap for nitial_database...Vladislav Vaintroub2019-12-121-2/+4
* Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
|\
| * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | Merge 10.1 into 10.1Marko Mäkelä2019-02-021-1/+1
|\ \
| * \ Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+1
| |\ \ | | |/
| | * Backport MDEV-17504 to 5.5Vladislav Vaintroub2019-01-111-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-2/+2
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-2/+2
| |\ \ | | |/
| | * 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-2/+1
| | | * Bug#26585560 - MYSQL DAEMON SHOULD CREATE ITS PID FILE ASShishir Jaiswal2017-12-021-1/+1
| | * | cmake: fix usage of GET_TARGET_PROPERTYSergei Golubchik2018-09-221-1/+1
* | | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-01-181-1/+1
| | |\ \ | | | |/
| | | * Backport patch for Bug#16877045 5.6-CLUSTER-7.3 WIN32 SQL_YACC.CC BUILD PROBLEMTor Didriksen2017-10-091-3/+6
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-09-251-11/+2
|\ \ \ \ | |/ / /
| * | | Fix compile with -DWITHOUT_DYNAMIC_PLUGINS on UnixVladislav Vaintroub2017-09-231-11/+2
* | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-191-40/+39
|\ \ \ \ | |/ / /
| * | | Build improvements and cleanups.Vladislav Vaintroub2017-09-081-40/+39
* | | | Merge 10.0 to 10.1Marko Mäkelä2017-05-261-4/+11
|\ \ \ \ | |/ / /
| * | | Workaround dependency problems (constant rebuilds) in Visual Studio generatorVladislav Vaintroub2017-05-231-4/+11
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-05-081-1/+3
|\ \ \ \ | |/ / /
| * | | restore dependencies, removed in f2dc04abeaSergei Golubchik2017-05-031-1/+3
* | | | cleanup: don't include *.h files into SQL_SOURCESSergei Golubchik2017-04-271-14/+14
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-04-061-22/+61
|\ \ \ \ | |/ / /
| * | | Compiling, Windows . Avoid unnecessary rebuilds with MSVC.Vladislav Vaintroub2017-04-031-22/+61
* | | | remove old API for SHA2Sergei Golubchik2017-03-101-1/+1
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-01-101-0/+1
|\ \ \ \ | |/ / /
| * | | MDEV-11088 Client plugins cannot be loaded by command line toolsVladislav Vaintroub2017-01-061-0/+1
* | | | Revert "Prepare XtraDB to be used with xtrabackup."Vladislav Vaintroub2016-10-231-8/+1
* | | | Prepare XtraDB to be used with xtrabackup.Vladislav Vaintroub2016-10-221-1/+8
* | | | MDEV-427/MDEV-5713 Add systemd script with notify functionalityDaniel Black2015-10-121-1/+2
* | | | MDEV-6080: Allowing storage engine to shortcut group by queriesMonty2015-10-051-0/+1
* | | | MDEV-8865 Wrong field type or metadata for COALESCE(signed_int_column, unsign...Alexander Barkov2015-09-301-0/+1
* | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-141-0/+1
* | | | rename {sys_vars,sql_plugin_services}.h -> *.icSergei Golubchik2015-06-281-1/+1
* | | | MDEV-8126 encryption for temp filesSergei Golubchik2015-06-021-3/+2
* | | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-2/+28
|\ \ \ \ | |/ / /
| * | | perfschema 5.6.24Sergei Golubchik2015-05-051-2/+28
* | | | Merge branch '10.1' of github.com:MariaDB/server into 10.1Sergei Petrunia2015-04-121-1/+1
|\ \ \ \
| * | | | renames to follow single consistent naming styleSergei Golubchik2015-04-091-1/+1
* | | | | MDEV-7836: ANALYZE FORMAT=JSON should provide info about GROUP/ORDER BYSergei Petrunia2015-04-121-1/+1
|/ / / /
* | | | Merge branch 'bb-10.1-explain-analyze' into 10.1Sergei Petrunia2015-03-241-0/+1
|\ \ \ \
| * | | | MDEV-7648: Extra data in ANALYZE FORMAT=JSON $stmtSergei Petrunia2015-03-241-0/+1
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-3/+5
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-5/+6
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42Sergei Golubchik2015-02-111-5/+6
| | |\ \ | | | |/
| | | * Bug#20136840 REMOVE REMAINING REFERENCES TO BZR IN CMAKE SCRIPTSTor Didriksen2014-12-111-4/+3
| | | * Bug#19890133 MAKE DIST USING BZR EXPORT EVEN FOR SOURCE DIR NOT A BZR REPOTor Didriksen2014-11-111-1/+2