summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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")
* | | | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | The functional changes of commit 5836191c8f0658d5d75484766fdcc3d838b0a5c1 (MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
| * | | 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
| | | | | |
* | | | | | Windows build - use InstallRequiredSystemLibraries for MSVC_CRT_TYPE=/MDbb-10.5-server-dllVladislav Vaintroub2020-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake parameter This includes compiler-specific dependencies - tiny part of CRT, mostly memcpy/memset in msvcr140.dll - exception handling in msvc140_1.dll - C++ standard library in msvcp140 not much else CMake is smart enough to copy the dependencies into the bin directory itself.
* | | | | | MDEV-21303 Make executables MariaDB namedRasmus Johansson2020-03-218-315/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To change all executables to have a mariadb name I had to: - Do name changes in every CMakeLists.txt that produces executables - CREATE_MARIADB_SYMLINK was removed and GET_SYMLINK added by Wlad to reuse the function in other places also - The scripts/CMakeLists.txt could make use of GET_SYMLINK instead of introducing redundant code, but I thought I'll leave that for next release - A lot of changes to debian/.install and debian/.links files due to swapping of real executable and symlink. I did not however change the name of the manpages, so the real name is still mysql there and mariadb are symlinks. - The Windows part needed a change now when we made the executables mariadb -named. MSI (and ZIP) do not support symlinks and to not break backward compatibility we had to include mysql named binaries also. Done by Wlad
* | | | | | 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
| | |\ \ \ | | | |/ /
View Lorry Controller Status