summaryrefslogtreecommitdiff
path: root/win
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.3' into 10.4Vladislav Vaintroub2020-06-051-1/+6
|\
| * Merge remote-tracking branch 'origin/10.2' into 10.3Vladislav Vaintroub2020-06-051-1/+6
| |\
| | * Fix appveyor build.Vladislav Vaintroub2020-06-051-1/+6
* | | Merge 10.3 into 10.4Marko Mäkelä2020-06-051-1/+8
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-06-051-1/+8
| |\ \ | | |/
| | * Windows, build tweak.Vladislav Vaintroub2020-06-051-1/+8
| | * fix warningVladislav Vaintroub2020-06-011-1/+1
* | | Merge branch '10.3' into 10.4Vladislav Vaintroub2020-06-011-1/+1
|\ \ \ | |/ /
| * | fix warningVladislav Vaintroub2020-06-011-1/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2020-05-304-205/+79
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-05-294-205/+79
| |\ \ | | |/
| | * MDEV-22743 Windows 10 MSI installer : port in use is not determinedVladislav Vaintroub2020-05-291-21/+76
| | * MSI installer : Use CAQuietExec64 on Win64 , not CAQuietExecVladislav Vaintroub2020-05-292-1/+3
| | * Remove unused WiX source fileVladislav Vaintroub2020-05-291-183/+0
* | | MDEV-22555 Windows, packaging: binaries depend on vcruntime140_1.dll, which ...Vladislav Vaintroub2020-05-141-4/+8
* | | Merge 10.3 into 10.4Marko Mäkelä2020-04-162-10/+20
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-04-152-10/+20
| |\ \ | | |/
| | * Merge 10.1 into 10.2Marko Mäkelä2020-04-142-10/+20
| | |\
| | | * Merge 5.5 into 10.1bb-10.1-mergeMarko Mäkelä2020-04-012-10/+20
| | | |\
| | | | * MDEV-22032 update HeidiSQL to version 11Vladislav Vaintroub2020-03-242-10/+20
* | | | | MDEV-19781 fixupsVladislav Vaintroub2019-11-277-272/+258
* | | | | MDEV-19781 Create MariaDB named commands on Windowsbb-10.4-MDEV-19781Rasmus Johansson2019-11-265-105/+437
* | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-07-282-10/+13
|\ \ \ \ \ | |/ / / /
| * | | | Fix Windows packaging.Vladislav Vaintroub2019-07-271-2/+2
| * | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-07-262-12/+15
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-262-16/+13
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-252-16/+13
| | | |\ \ | | | | |/
| | | | * MDEV-19922 Old version of heidisql in mariadb installerVladislav Vaintroub2019-07-052-16/+13
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-07-021-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-07-021-2/+2
| |\ \ \ \ | | |/ / /
| | * | | MDEV-19889 In CMakeLists.txt, use ${CMAKE_CPACK_COMMAND},rather than just cpackVladislav Vaintroub2019-06-271-2/+2
* | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-195-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-05-145-6/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-135-6/+6
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-113-3/+3
| | | |\ \ | | | | |/
| | | | * Update FSF AddressVicențiu Ciorbaru2019-05-113-3/+3
| | | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-112-3/+3
| | | |\ \ | | | | |/
| | | | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-111-1/+1
| | | | * Update FSF addressMichal Schorm2019-05-102-3/+3
* | | | | MDEV-19354 : Change default service name in MSI UI to MariaDB.Vladislav Vaintroub2019-04-292-2/+2
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-03-061-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-03-051-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2019-03-041-2/+3
| | |\ \ \ | | | |/ /
| | | * | Merge branch '10.0' into 10.1Oleksandr Byelkin2019-03-011-2/+3
| | | |\ \
| | | | * \ Merge branch '5.5' into 10.0Oleksandr Byelkin2019-02-281-2/+3
| | | | |\ \ | | | | | |/
| | | | | * MDEV-18506 MSI can't be built if MFC package is not installed with Visual StudioVladislav Vaintroub2019-02-071-2/+3
* | | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-02-211-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | dirty mergeOleksandr Byelkin2019-02-071-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2019-02-031-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.1 into 10.1Marko Mäkelä2019-02-021-1/+1
| | | |\ \ \ | | | | |/ /