summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2021-09-111-1/+1
|\
| * Merge 10.2 into 10.3Marko Mäkelä2021-09-111-1/+1
| |\
| | * Speedup build of the MSI packageVladislav Vaintroub2021-09-101-1/+1
| | |
* | | Merge remote-tracking branch 'upstream/10.3' into 10.4Vicențiu Ciorbaru2021-09-092-0/+12
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2021-09-072-0/+12
| |\ \ | | |/
| | * MDEV-26514 Option to build a separate test zip package on WindowsElena Stepanova2021-08-312-0/+12
| | | | | | | | | | | | Add a possibility to run MTR tests on a release zip
* | | Merge 10.3 into 10.4Marko Mäkelä2021-06-082-2/+5
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-06-082-2/+5
| |\ \ | | |/
| | * MDEV-23815 Windows : mysql_upgrade_wizard fails, if service name has spacesVladislav Vaintroub2021-06-061-1/+4
| | | | | | | | | | | | | | | The fix is to quote service name parameter, when it is passed to mysql_upgrade_service subprocess.
| | * MDEV-25859 - HeidiSQL 11.3Vladislav Vaintroub2021-06-051-1/+1
| | |
* | | Merge branch '10.3' into 10.4Sergei Golubchik2021-02-231-1/+1
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2021-02-221-1/+1
| |\ \ | | |/
| | * MDEV-24762 - HeidiSQL 11.2Vladislav Vaintroub2021-02-021-1/+1
| | |
* | | 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
| | | | | | | | | | | | Allow targets for building "noinstall" zip, and debuginfo zip.
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when checking for free port, use the same logic (IPv6 socket address / dual socket), like the server would. Previous solution for testing whether port is free was trying to bind IPv4 socket on INADDR_ANY. This not work now on some reason, that attempt succeeds, even if there is an existing IPv6-dual socket listening on 0.0.0.0:3306
| | * MSI installer : Use CAQuietExec64 on Win64 , not CAQuietExecVladislav Vaintroub2020-05-292-1/+3
| | | | | | | | | | | | | | | It works, but irritates people who look into the log and see traces of 32bit custom action server.
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not in MSI When server is compiled with recent VS2019, then executables, have dependency on vcruntime140_1.dll While we include the VC redistributable merge modules into our MSI package, those merge modules were stale (taken from older VS version, 2017) Since VS2019 brough new DLL dependency by introducing new exception handling https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64 thus the old MSMs were not enough. The fix is to change logic in win/packaging/CMakeLists.txt to look up for the correct, new MSMs. The bug only affects 10.4,as we compile with static CRT before 10.4, and partly-statically(just vcruntime stub is statically linked, but not UCRT) after 10.4 For the fix to work, it required also some changes on the build machine (vs_installer, modify VS2019 installation, add Individual Component "C++ 2019 Redistributable MSMs")
* | | Merge 10.3 into 10.4Marko Mäkelä2020-04-162-10/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | In main.index_merge_myisam we remove the test that was added in commit a2d24def8cc42d27c72d833abfb39ef24a2b96ba because it duplicates the test case that was added in commit 5af12e463549e4bbc2ce6ab720d78937d5e5db4e.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It is not enough to have and DeleteSymlinks actions because within the same installation some exes executables can be both added and removed, which needs both adding and removing some symlinks. Instead of CreateSymlinks, there is now FixSymlinks function, which goes through the list, and adds or removes the symlinks as needed. - Implemented rollback for symlink custom action. - Generate list of symlinks in C++ file, using CMake, rather than storing lists as MSI properties.
* | | | | MDEV-19781 Create MariaDB named commands on Windowsbb-10.4-MDEV-19781Rasmus Johansson2019-11-265-105/+437
| | | | | | | | | | | | | | | | | | | | | | | | | Added CreateSymlinks and DeleteSymlinks functions to CustomAction.cpp. Extra.wxs.in calls them.
* | | | | 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
| | | | | | | | | | | | | | | | | | | | Upgrade HeidiSQL to 10.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
| | | | |
* | | | | 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
| | | | | | | | | | | | | | | | | | | | * Update wrong zip-code
| | | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-112-3/+3
| | | |\ \ | | | | |/
View Lorry Controller Status