Commit graph

315 commits

Author SHA1 Message Date
Vladislav Vaintroub
0ea45725d8 Fix 2 more VS2015 warnings 2018-02-19 15:22:24 +00:00
Sergei Golubchik
4771ae4b22 Merge branch 'github/10.1' into 10.2 2018-02-06 14:50:50 +01:00
Sergei Golubchik
d4df7bc9b1 Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
Vicențiu Ciorbaru
d833bb65d5 Merge remote-tracking branch '5.5' into 10.0 2018-01-24 12:29:31 +02:00
Vladislav Vaintroub
2fad31a1cf MDEV-14446 followup
Fix WinUIDialogBmp.jpg to use correct dimensions
2018-01-18 16:42:11 +00:00
Vladislav Vaintroub
a73cb82db0 MDEV-14446 Windows installer still uses the old brown logo
Use new grey logo.
2018-01-18 16:15:18 +00:00
Sergei Golubchik
e0a1c745ec Merge branch '10.1' into 10.2 2017-10-24 14:53:18 +02:00
Sergei Golubchik
9d2e2d7533 Merge branch '10.0' into 10.1 2017-10-22 13:03:41 +02:00
Vladislav Vaintroub
e6862cf1ff Windows MSI : dump server error log to MSI log on installation failure.
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.
2017-10-03 00:13:58 +00:00
Marko Mäkelä
f192b48d62 Merge 10.1 into 10.2 2017-08-29 10:07:33 +03:00
Marko Mäkelä
11352d52cd Merge 10.0 into 10.1 2017-08-28 15:05:46 +03:00
Vladislav Vaintroub
db51ad1e01 Remove workaround for ancient and already fixed CMake bug in MSI creation.
The workaround, an extra cmake calls, somehow makes the
connect/cmake_install.cmake to lose installation of connect-engine's
specific jar files.
2017-08-23 18:11:24 +00:00
Sergei Golubchik
f6633bf058 Merge branch '10.1' into 10.2 2017-07-05 19:08:55 +02:00
Vladislav Vaintroub
472c2d9b2f MDEV-13106 : Fix check for empty directory in MSI installer 2017-06-19 18:23:55 +00:00
Marko Mäkelä
14c6f00a9f Merge 10.1 into 10.2
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).
2017-05-06 14:36:46 +03:00
Vladislav Vaintroub
1991411f16 MDEV-9566 MariaBackup packaging 2017-04-27 19:12:40 +02:00
Marko Mäkelä
1494147cf6 Merge 10.1 into 10.2 2017-04-06 09:52:25 +03:00
Marko Mäkelä
8d4871a953 Merge 10.0 into 10.1 2017-04-06 08:53:59 +03:00
Vladislav Vaintroub
f2dc04abea Compiling, Windows . Avoid unnecessary rebuilds with MSVC.
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.
2017-04-03 18:48:48 +00:00
Vladislav Vaintroub
0cca5bdf0b Allow to specify C runtime library used for compilation.
Default to static release (previously static debug was used in debug
builds, but not is appears to be too slow)
2017-04-02 17:29:04 +00:00
Sergei Petrunia
5210c69e71 Merge 10.2 into bb-10.2-mariarocks 2017-03-31 01:14:00 +03:00
Sergei Golubchik
da4d71d10d Merge branch '10.1' into 10.2 2017-03-30 12:48:42 +02:00
Vladislav Vaintroub
b56262f696 MDEV-12328, attempt to fix windows packaging 2017-03-26 23:03:25 +00:00
Vladislav Vaintroub
4967c78aa0 make sure rocksdb-engine compoment is in MSI 2017-03-21 19:41:28 +00:00
Sergei Golubchik
09a2107b1b Merge branch '10.0' into 10.1 2017-03-21 19:20:44 +01:00
Sergei Golubchik
0d622bed4f Merge branch '5.5' into 10.0 2017-03-21 11:35:50 +01:00
Vladislav Vaintroub
3990e55fef Windows : Fix packaging when building with VS2017 2017-03-13 23:31:03 +00:00
Vladislav Vaintroub
f0a2f4bbb9 Windows : Remove the option for creating anonymous account from the MSI in 10.2 2017-03-13 20:14:28 +00:00
Vladislav Vaintroub
b7ffe9b81e MDEV-11903 : correction - min innodb pagesize is 4K 2017-03-13 19:58:04 +00:00
Vladislav Vaintroub
a8715884a4 MDEV-11903 Windows : Support innodb page sizes in the 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
2017-03-13 18:39:11 +00:00
iangilfillan
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
Vladislav Vaintroub
3b30031d03 MDEV-12202 Do not package embedded in MSI
Also get rid of example ini files, they do not provide any value,
just confusion
2017-03-07 21:22:25 +00:00
Vladislav Vaintroub
bae2fc1f38 More verbose output for the Wix linker (light.exe)
This is an attempt to workaround buildbot
"1200 seconds without output, killing process"
2017-02-08 12:19:28 +00:00
Sergei Golubchik
2f20d297f8 Merge branch '10.0' into 10.1 2016-12-11 09:53:42 +01:00
Sergei Golubchik
3e8155c637 Merge branch '5.5' into 10.0 2016-12-09 16:33:48 +01:00
Vladislav Vaintroub
e0f48e5ce9 MDEV-11214 Windows : MSI installation fails, if run by a service user (e.g 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.
2016-11-03 16:21:48 +00:00
Vladislav Vaintroub
2a2e79b702 MDEV-11157 Windows - Upgrade installer to use HeidiSQL 9.4 2016-10-27 19:45:44 +00:00
Sergei Golubchik
66d9696596 Merge branch '10.0' into 10.1 2016-09-28 17:55:28 +02:00
Sergei Golubchik
77ce4ead81 Merge branch '5.5' into 10.0 2016-09-27 09:21:19 +02:00
Vladislav Vaintroub
a92a8cc817 Windows packaging : use /d switch to sign MSI, to prevent installer showing randomly generated name in UAC prompt 2016-08-19 17:11:20 +00:00
Vladislav Vaintroub
09cb64682b Windows : fix search for WiX root directory when using 64bit cmake
"C:\Program Files (x86)" directory needs to be checked as well in
this case.
2016-08-11 19:39:04 +00:00
Sergei Golubchik
3361aee591 Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
Sergei Golubchik
c081c978a2 Merge branch '5.5' into bb-10.0 2016-06-21 14:11:02 +02:00
Vladislav Vaintroub
b6e826bac2 MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the installer. Do not lauch upgrade wizard after installation 2016-05-24 23:15:00 +02:00
Vladislav Vaintroub
535160b170 MDEV-10117 - update HeidiSQL to current version 2016-05-24 16:57:03 +02:00
Vladislav Vaintroub
9eb0fbda3e MDEV-10071 Block installation on XP/Windows 2003 Server(they are no more supported) 2016-05-24 14:23:03 +02:00
Vladislav Vaintroub
18487ed60e MDEV-10108 Fix errors in installations by domain user 2016-05-24 14:23:03 +02:00
Vladislav Vaintroub
672bbcd741 MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)
This appears to break some installation, and it did not do anything
useful anyway.
2016-04-27 16:25:08 +02:00
Vladislav Vaintroub
646c4cea58 MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)
This appears to break some installation, and it did not do anything
useful anyway.
2016-04-27 16:13:14 +02:00
Vladislav Vaintroub
46089d7691 MDEV-9659 : AWS KMS encryption plugin 2016-03-13 20:29:14 +01:00