summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | | | | | | | | | candle.exe's preprocessor flags (-dHaveUpgradeWizard=0 -DHaveInnodb=1) were not passed correctly to EXECUTE_PROCESS Fix is to make a list out of the EXTRA_WIX_PREPROCESSOR_FLAGS string, and use the preprocessor flags list in EXECUTE_PROCESS.
* | | Merge 10.1 into 10.1Marko Mäkelä2019-02-021-1/+1
|\ \ \ | |/ / | | | | | | This is joint work with Oleksandr Byelkin.
| * | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+1
| |\ \ | | |/
| | * MDEV-18254 upgrade HeidiSQL to 9.5Vladislav Vaintroub2019-01-151-1/+1
| | |
* | | 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
| | | | | | | | | | | | Fix WinUIDialogBmp.jpg to use correct dimensions
| | * MDEV-14446 Windows installer still uses the old brown logoVladislav Vaintroub2018-01-182-0/+0
| | | | | | | | | | | | Use new grey logo.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | On failure, installer executes rollback actions, among them removing newly created data directory with all files in it. This patch makes installer at dump mariadb error log to installer log, before removing the files. This should make troubleshooting a little easier.
* | | 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
| | | | | | | | | | | | | | | | | | The workaround, an extra cmake calls, somehow makes the connect/cmake_install.cmake to lose installation of connect-engine's specific jar files.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To export symbols from the mysqld.exe, use lib.exe with /DEF, rather than pre-link step when building mysqld.exe. This helps to avoid relinking all plugins, if mysqld.exe was recompiled but the list of its exports has not changed. Also removed unnecessary DEPENDS in some ADD_CUSTOM_COMMAND (gen_lex_token, gen_lex_hash etc). They confuse VS generator which tends to recreate headers and do unnecessary recompilations.
* | | 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 ↵Vladislav Vaintroub2016-11-031-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | LocalSystem) Skip permission for data directory for LogonUser, if installation runs by one of the service accounts (determined from their well-known SID). There is no real LogonUser in this case.
| | * 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 ↵Vladislav Vaintroub2016-08-191-0/+1
| | | | | | | | | | | | randomly generated name in UAC prompt
| | * Windows : fix search for WiX root directory when using 64bit cmakeVladislav Vaintroub2016-08-111-4/+7
| | | | | | | | | | | | | | | "C:\Program Files (x86)" directory needs to be checked as well in this case.
* | | 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 ↵Vladislav Vaintroub2016-05-241-0/+3
| | | | | | | | | | | | supported)
| | * 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
| | | | | | | | | | | | | | | This appears to break some installation, and it did not do anything useful anyway.
| * | MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the ↵Vladislav Vaintroub2016-05-241-2/+2
| | | | | | | | | | | | installer. Do not lauch upgrade wizard after installation
* | | MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)Vladislav Vaintroub2016-04-271-11/+0
| | | | | | | | | | | | | | | This appears to break some installation, and it did not do anything useful anyway.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick f1daf9ce from 10.0 branch ------------------------------------- Fix build failures caused by new C runtime library - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads - P_tmpdir, tzname are no more defined - lfind() and lsearch() in lf_hash.c had to be renamed, declaration conflicts with some C runtime functions with the same name declared in a header included by stdlib.h Also fix couple of annoying warnings : - remove #define NOMINMAX from config.h to avoid "redefined" compiler warnings(NOMINMAX is already in compile flags) - disable incremental linker in Debug as well (feature not used much and compiler crashes often) Also simplify package building with Wix, require Wix 3.9 or later (VS2015 is not compatible with old Wix 3.5/3.6)
* | | 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | referenced_by_foreign_key2(), needed for InnoDB to compile, was taken from 10.0-galera
| | * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, the files get checked out with CRLF thanks to .gitattributes.
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-072-2/+28
| | |\ \ \ \
View Lorry Controller Status