summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.4' into 10.5Vladislav Vaintroub2019-11-277-271/+256
|\ | | | | | | | | # Conflicts: # win/packaging/extra.wxs.in
| * 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.
* | 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
| | | | | | | | | | Added CreateSymlinks and DeleteSymlinks functions to CustomAction.cpp. Extra.wxs.in calls them.
* | MDEV-20907 Set innodb_log_files_in_group=1 by defaultMarko Mäkelä2019-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | Historically, InnoDB split the redo log into at least 2 files. MDEV-12061 allowed the minimum to be innodb_log_files_in_group=1, but it kept the default at innodb_log_files_in_group=2. Because performance seems to be slightly better with only one log file, and because implementing an append-only variant of the log would require a single file, let us define the default to be 1, and have innodb_log_file_size=96M, to retain the same default total size.
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | Upgrade HeidiSQL to 10.2
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Not much use of this feature so far.
* | | | | | Windows MSI : small cleanups, disable Windows 7/8Vladislav Vaintroub2019-06-271-13/+2
| | | | | |
* | | | | | Windows : Do not package redistributable C runtime , nor merge modules into ↵Vladislav Vaintroub2019-06-273-50/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows installers Rely on Universal CRT to be on every computer we install.
* | | | | 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
| | | |\ \ | | | | |/
| | | | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some places didn't match the previous rules, making the Floor address wrong. Additional sed rules: sed -i -e 's/Place.*Suite .*, Boston/Street, Fifth Floor, Boston/g' sed -i -e 's/Suite .*, Boston/Fifth Floor, Boston/g'
| | | | * Update FSF addressMichal Schorm2019-05-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is based on the work of Michal Schorm, rebased on the earliest MariaDB version. Th command line used to generate this diff was: find ./ -type f \ -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \ -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
* | | | | 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
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | FIXME: Properly resolve conflicts between MDEV-18883 and MDEV-7742/MDEV-8305, and record the correct result for main.log_slow
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Temporarily disable a test for commit 2175bfce3e9da8332f10ab0e0286dc93915533a2 because fixing it in 10.2 requires updating libmariadb.
| | | * | | 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 10.3 into 10.4Marko Mäkelä2018-11-191-13/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-16448 mysql_upgrade_service remove my.ini variables that are no more validVladislav Vaintroub2018-11-151-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | MDEV-16447 incorporate Innodb slow shutdown into mysql_upgrade_service.exe
* | | | | | MDEV-17279 Windows : link C runtime dynamicallyVladislav Vaintroub2018-10-097-47/+74
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the build to use /MD flag so that DDL version of C runtime is used. To make sure MariaDB is always runnable on target system, include redistributable CRT libraries into installer. For MSI package, use Microsoft's merge modules. For ZIP use "applocal" approach,i.e place redistributable dlls into the bin directory of the package(via InstallRequiredSystemLibraries cmake module) The space overhead of libraries in negligible, ~ 3MB unpacked. There are 2 cases, where we still link C runtime statically - Upgrade wizard, it uses MFC, and we link statically to avoid redistribute also whole MFC (for this single application, does not make much sense). - MSI installer's custom action dll wixca.dll.Here, we need static link so that MSI won't fail on a target system that does not have VC++2015 runtime already installed.
* | | | | 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
| | | | | | | | | | | | | | | | | | | | Added forgotten code signing command.
| * | | | MDEV-15088 Lighter version of Windows Zip distributionsVladislav Vaintroub2018-09-144-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new target win_package, that produces a) light ZIP (no test suite, no sql-bench, no debugsymbols) b) debug symbols ZIP
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable /permissive- flag, so MFC is found, and upgrade_wizard is built. MFC code is not standard C++, so it doesn not play well with /permissive-
* | | | | Feedback plugin - MSI installation checkbox switched to OFF again.Vladislav Vaintroub2018-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | It was on for alpha stages of 10.3, and now we're past that.
View Lorry Controller Status