summaryrefslogtreecommitdiff
path: root/win
Commit message (Expand)AuthorAgeFilesLines
* 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.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
* | fix warningVladislav Vaintroub2020-06-011-1/+1
* | 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
* | 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
* | | | 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.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 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
* | | | 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
* | | | | 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
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+1
| | | |\ \ | | | | |/
| | | | * MDEV-18254 upgrade HeidiSQL to 9.5Vladislav Vaintroub2019-01-151-1/+1
* | | | | MDEV-16448 mysql_upgrade_service remove my.ini variables that are no more validVladislav Vaintroub2018-11-151-13/+14
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-284-1/+35
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-15088 Lighter version of Windows Zip distributionsVladislav Vaintroub2018-09-181-0/+5
| * | | | MDEV-15088 Lighter version of Windows Zip distributionsVladislav Vaintroub2018-09-144-1/+30
* | | | | fix third-party tool packaging on WinSergei Golubchik2018-08-132-2/+3
* | | | | MDEV-16662 CMake warnings: CMP0026Sergei Golubchik2018-08-125-69/+71
* | | | | MDEV-16345 : No upgrade wizard in 10.3 in Windows packages.Vladislav Vaintroub2018-05-301-0/+3
* | | | | Feedback plugin - MSI installation checkbox switched to OFF again.Vladislav Vaintroub2018-04-121-1/+1
* | | | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2018-02-231-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch '10.2' into bb-10.2-extSergei Golubchik2018-02-221-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix 2 more VS2015 warningsVladislav Vaintroub2018-02-191-1/+1
* | | | | | Windows : Fix /permissive- compile errorVladislav Vaintroub2018-02-211-1/+1