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
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ä
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
Vladislav Vaintroub
472c2d9b2f
MDEV-13106 : Fix check for empty directory in MSI installer
2017-06-19 18:23:55 +00:00
Vladislav Vaintroub
1991411f16
MDEV-9566 MariaBackup packaging
2017-04-27 19:12:40 +02: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
iangilfillan
f0ec34002a
Correct FSF address
2017-03-10 18:21:29 +01: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
Sergei Golubchik
a5679af1b1
Merge branch '10.0' into 10.1
2016-02-23 21:35:05 +01:00
Sergei Golubchik
271fed4106
Merge branch '5.5' into 10.0
2016-02-15 22:50:59 +01:00
Sergei Golubchik
c4cb240061
MDEV-9024 Build fails with VS2015
...
cherry-pick f1daf9ce
2016-02-06 22:41:58 +01:00
Vladislav Vaintroub
67cf76ad9b
MDEV 4691- address review comments
2016-01-19 11:59:32 +01:00
Sergei Golubchik
e3d37bfebf
Merge branch 'connect/10.1' into 10.1
2015-11-19 18:09:06 +01:00
Vladislav Vaintroub
f1daf9ced4
MDEV-9024 Build fails with VS2015
...
Fix build failures caused by new C runtime library
- isnan, snprintf, struct timespec are now defined, attempt to
redefine them leads
- P_tmpdir, tzname are no more defined
- lfind() and lsearch() in lf_hash.c had to be renamed, declaration
conflicts with some C runtime functions with the same name declared in
a header included by stdlib.h
Also fix couple of annoying warnings :
- remove #define NOMINMAX from config.h to avoid "redefined" compiler
warnings(NOMINMAX is already in compile flags)
- disable incremental linker in Debug as well (feature not used much
and compiler crashes often)
Also simplify package building with Wix, require Wix 3.9 or later
(VS2015 is not compatible with old Wix 3.5/3.6)
2015-11-06 17:27:24 +01:00
Sergei Golubchik
cfeedbfd3e
Merge branch '5.5' into 10.0
2015-10-09 17:12:26 +02:00
Sergei Golubchik
16c4b3c68b
fixes for buildbot:
...
* OSX (mysqlimport freeing unallocated memory)
* Windows (didn't compile MSI)
* fulltest2 (innodb crashes in --embedded --big)
2015-10-09 16:43:59 +02:00
Olivier Bertrand
9c6405fefa
Commit resolved conflicts
2015-09-18 18:39:08 +02:00
Sergei Golubchik
530a6e7481
Merge branch '10.0' into 10.1
...
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
2015-09-03 12:58:41 +02:00
Sergei Golubchik
9cb8cff312
MDEV-8296 MSVS 2013 & WiX 3.9
...
Support for VS2013 and WiX 3.9
(patch by Andrey Kuznetsov)
2015-08-01 17:48:41 +02:00
Sergei Golubchik
658992699b
Merge tag 'mariadb-10.0.20' into 10.1
2015-06-27 20:35:26 +02:00
Sergei Golubchik
810cf362ea
Merge branch '5.5' into 10.0
2015-06-11 20:20:35 +02:00
Olivier Bertrand
1c756512b0
Commit win and CONNECT resolved files
2015-06-05 23:54:19 +02:00
Olivier Bertrand
5d038d3734
commit win/ changes
2015-06-05 23:33:23 +02:00
Vicentiu Ciorbaru
ab54f5a8b9
Fix win/ files to be stored with LF in repository
...
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
2015-05-08 17:31:54 +03:00
Vicentiu Ciorbaru
373d092b3a
Fix win/ files to be stored with LF in repository
...
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
2015-05-08 17:19:48 +03:00
Vicentiu Ciorbaru
0880284bf7
Fix win/ files to be stored with LF in repository
...
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
2015-05-08 17:06:35 +03:00
Sergei Golubchik
b5c5f3176a
convert files from CRLF to LF line endings
2015-05-08 11:48:16 +02:00
