summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* 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.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
| |
* | fix warningVladislav Vaintroub2020-06-011-1/+1
| |
* | 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
| |
* | 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
| | | |
* | | | 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.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 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' {} \;
* | | | 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.
* | | | | 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
| | | | |
* | | | | 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
* | | | | 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.
* | | | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2018-02-231-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch '10.2' into bb-10.2-extSergei Golubchik2018-02-221-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix 2 more VS2015 warningsVladislav Vaintroub2018-02-191-1/+1
| | | | | |
* | | | | | Windows : Fix /permissive- compile errorVladislav Vaintroub2018-02-211-1/+1
| | | | | |
View Lorry Controller Status