summaryrefslogtreecommitdiff
path: root/win
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-022-0/+0
|\
| * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-242-0/+0
| |\
| | * MDEV-14446 followupVladislav Vaintroub2018-01-181-0/+0
| | * MDEV-14446 Windows installer still uses the old brown logoVladislav Vaintroub2018-01-182-0/+0
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-1/+44
|\ \ \ | |/ /
| * | Windows MSI : dump server error log to MSI log on installation failure.Vladislav Vaintroub2017-10-031-1/+44
* | | Merge 10.0 into 10.1Marko Mäkelä2017-08-281-14/+0
|\ \ \ | |/ /
| * | Remove workaround for ancient and already fixed CMake bug in MSI creation.Vladislav Vaintroub2017-08-231-14/+0
* | | MDEV-13106 : Fix check for empty directory in MSI installerVladislav Vaintroub2017-06-191-1/+1
* | | MDEV-9566 MariaBackup packagingVladislav Vaintroub2017-04-271-1/+6
* | | Merge 10.0 into 10.1Marko Mäkelä2017-04-061-5/+41
|\ \ \ | |/ /
| * | Compiling, Windows . Avoid unnecessary rebuilds with MSVC.Vladislav Vaintroub2017-04-031-5/+41
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-211-1/+1
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2017-03-211-1/+1
| |\ \ | | |/
| | * Windows : Fix packaging when building with VS2017Vladislav Vaintroub2017-03-131-1/+1
* | | Correct FSF addressiangilfillan2017-03-102-3/+3
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-113-5/+28
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-093-5/+28
| |\ \ | | |/
| | * MDEV-11214 Windows : MSI installation fails, if run by a service user (e.g L...Vladislav Vaintroub2016-11-031-1/+16
| | * MDEV-11157 Windows - Upgrade installer to use HeidiSQL 9.4Vladislav Vaintroub2016-10-272-4/+12
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-282-4/+8
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-272-4/+8
| |\ \ | | |/
| | * Windows packaging : use /d switch to sign MSI, to prevent installer showing r...Vladislav Vaintroub2016-08-191-0/+1
| | * Windows : fix search for WiX root directory when using 64bit cmakeVladislav Vaintroub2016-08-111-4/+7
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-283-4/+9
|\ \ \ | |/ /
| * | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-212-13/+7
| |\ \ | | |/
| | * MDEV-10117 - update HeidiSQL to current versionVladislav Vaintroub2016-05-241-1/+1
| | * MDEV-10071 Block installation on XP/Windows 2003 Server(they are no more supp...Vladislav Vaintroub2016-05-241-0/+3
| | * MDEV-10108 Fix errors in installations by domain userVladislav Vaintroub2016-05-241-1/+3
| | * MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)Vladislav Vaintroub2016-04-271-11/+0
| * | MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the ins...Vladislav Vaintroub2016-05-241-2/+2
* | | MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)Vladislav Vaintroub2016-04-271-11/+0
* | | MDEV-9659 : AWS KMS encryption pluginVladislav Vaintroub2016-03-131-2/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-3/+0
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-3/+0
| |\ \ | | |/
| | * MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-062-57/+45
* | | MDEV 4691- address review commentsVladislav Vaintroub2016-01-191-13/+8
* | | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2015-11-192-5/+5
|\ \ \ | |/ / |/| |
| * | Commit resolved conflictsOlivier Bertrand2015-09-183-2/+6
| |\ \
| | * \ Merge branch '10.0' into 10.1Sergei Golubchik2015-09-032-1/+6
| | |\ \
| | * \ \ Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-1/+0
| | |\ \ \
| * | \ \ \ Commit win and CONNECT resolved filesOlivier Bertrand2015-06-052-7/+33
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix win/ files to be stored with LF in repositoryVicentiu Ciorbaru2015-05-0816-1896/+1896
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-072-2/+28
| | |\ \ \ \
| * | | | | | commit win/ changesOlivier Bertrand2015-06-0516-1870/+1870
| |/ / / / /
| * | | | | fix for cmake builds on windowsSergei Golubchik2015-02-101-2/+2
* | | | | | MDEV-9024 Build fails with VS2015Vladislav Vaintroub2015-11-062-58/+44
* | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | fixes for buildbot:mariadb-5.5.46Sergei Golubchik2015-10-091-0/+2
* | | | | MDEV-8296 MSVS 2013 & WiX 3.9Sergei Golubchik2015-08-012-1/+6
| |_|_|/ |/| | |