summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | MDEV-19889 In CMakeLists.txt, use ${CMAKE_CPACK_COMMAND},rather than just cpackVladislav Vaintroub2019-06-271-2/+2
| | |
* | | 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.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 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-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 2 more VS2015 warningsVladislav Vaintroub2018-02-191-1/+1
| | | |
* | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-062-0/+0
|\ \ \ \ | |/ / /
| * | | 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.1' into 10.2Sergei Golubchik2017-10-241-1/+44
|\ \ \ \ | |/ / /
| * | | 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.1 into 10.2Marko Mäkelä2017-08-291-14/+0
|\ \ \ \ | |/ / /
| * | | 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.
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-051-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-13106 : Fix check for empty directory in MSI installerVladislav Vaintroub2017-06-191-1/+1
| | | |
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Also, include fixes by Vladislav Vaintroub to the aws_key_management plugin. The AWS C++ SDK specifically depends on OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
| * | | MDEV-9566 MariaBackup packagingVladislav Vaintroub2017-04-271-1/+6
| | | |
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-061-5/+41
|\ \ \ \ | |/ / /
| * | | 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.
* | | | Allow to specify C runtime library used for compilation.Vladislav Vaintroub2017-04-022-5/+9
| | | | | | | | | | | | | | | | | | | | Default to static release (previously static debug was used in debug builds, but not is appears to be too slow)
* | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-314-69/+29
|\ \ \ \
| * \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-03-302-3/+3
| |\ \ \ \ | | |/ / /
| | * | | 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
| | | | |
| * | | | MDEV-12328, attempt to fix windows packagingVladislav Vaintroub2017-03-261-1/+1
| | | | |
| * | | | Windows : Remove the option for creating anonymous account from the MSI in 10.2Vladislav Vaintroub2017-03-131-12/+1
| | | | |
| * | | | MDEV-11903 : correction - min innodb pagesize is 4KVladislav Vaintroub2017-03-131-2/+0
| | | | |
| * | | | MDEV-11903 Windows : Support innodb page sizes in the ↵Vladislav Vaintroub2017-03-131-53/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installer/mysql_install_db.exe - add PAGESIZE property to the MSI installer - add combobox to the MSI UI to select innodb page size - add new parameter --innodb_page_size for mysql_install_db.exe. this is passed down to bootstrap and also stored in my.ini. MSI will call mysql_install_db.exe with --innodb_page_size set to the PAGESIZE property
View Lorry Controller Status