summaryrefslogtreecommitdiff
path: root/win
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2020-06-061-1/+6
|\
| * 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.4 into 10.5Marko Mäkelä2020-06-051-1/+8
|\ \ \ \ | |/ / /
| * | | 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.4' into 10.5Vladislav 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.4 into 10.5Marko Mäkelä2020-05-314-205/+79
|\ \ \ \ | |/ / /
| * | | 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
* | | | MDEV-22612 Fix -DWITH_ASAN=1 on Windows.Vladislav Vaintroub2020-05-181-9/+1
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-04-252-10/+20
|\ \ \ \ | |/ / /
| * | | 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
* | | | | | Windows build - use InstallRequiredSystemLibraries for MSVC_CRT_TYPE=/MDbb-10.5-server-dllVladislav Vaintroub2020-04-101-1/+1
* | | | | | MDEV-21303 Make executables MariaDB namedRasmus Johansson2020-03-218-315/+9
* | | | | | Merge branch '10.4' into 10.5Vladislav Vaintroub2019-11-277-271/+256
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-19781 fixupsVladislav Vaintroub2019-11-277-272/+258
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-11-275-103/+435
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-19781 Create MariaDB named commands on Windowsbb-10.4-MDEV-19781Rasmus Johansson2019-11-265-105/+437
* | | | | | MDEV-20907 Set innodb_log_files_in_group=1 by defaultMarko Mäkelä2019-10-281-3/+3
* | | | | | Merge remote-tracking branch 'origin/10.4' into 10.5Alexander Barkov2019-08-132-10/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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.4 into 10.5Marko Mäkelä2019-08-131-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | Remove feedback from Windows MSIVladislav Vaintroub2019-06-301-56/+2
* | | | | | Windows MSI : small cleanups, disable Windows 7/8Vladislav Vaintroub2019-06-271-13/+2
* | | | | | Windows : Do not package redistributable C runtime , nor merge modules into W...Vladislav Vaintroub2019-06-273-50/+1
|/ / / / /
* | | | | 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
| | |\ \ \ | | | |/ /