mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
176611 commits 2774 branches 343 tags 1.6 GiB
Commit graph

284 commits

Author SHA1 Message Date
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
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 from 10.0 branch
-------------------------------------

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)
 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
Sergei Golubchik
2db62f686e Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Sergei Golubchik
d996dc2997 MDEV-7290 please update MSI installer to include HeidiSQL 9.1 2015-02-11 15:02:15 +01:00
Sergei Golubchik
01963e5df1 fix for cmake builds on windows 2015-02-10 10:21:16 +01:00
Sergei Golubchik
dfc7e9541d MDEV-7531 Update 10.0.15 to 10.0.16 -> Error 2003 (HY000) can't connect to MySql server. 
use the old registry branch, even if we changed the "manufacturer" string
 2015-01-30 15:53:24 +01:00
Nirbhay Choubey
def5bd67ba MDEV-6891: Update company name 2014-12-12 10:40:27 -05:00
Nirbhay Choubey
4ba6ee1b31 MDEV-6891: Update company name 2014-12-12 10:38:19 -05:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Sergei Golubchik
8bdda78c82 MDEV-6271 update MSI installer to include latest Version of HeidiSQL (8.3.x.x) 2014-05-27 21:05:44 +02:00
Sergei Golubchik
72ba95873a 10.0-base merge 
(without InnoDB - all InnoDB changes were ignored)
 2013-06-06 21:32:29 +02:00
Vladislav Vaintroub
db7085dfae remove start menu shortcut to upgrade wizard 2013-05-19 17:42:30 +02:00
Vladislav Vaintroub
b67ec975dc MDEV-4544 : Update MSI installer to use latest HeidiSQL 8.0 2013-05-19 17:41:22 +02:00