mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
196945 commits 2784 branches 343 tags 1.6 GiB
Commit graph

455 commits

Author SHA1 Message Date
Marko Mäkelä
2a791c53ad Merge 10.3 into 10.4 2019-03-06 09:00:52 +02:00
Marko Mäkelä
446b3ebdfc Merge 10.2 into 10.3 
FIXME: Properly resolve conflicts between MDEV-18883
and MDEV-7742/MDEV-8305, and record the correct result for
main.log_slow
 2019-03-05 12:56:05 +02:00
Marko Mäkelä
9835f7b80f Merge 10.1 into 10.2 2019-03-04 16:46:58 +02:00
Oleksandr Byelkin
f2e1451740 Merge branch '10.0' into 10.1 2019-03-01 15:52:06 +01:00
Oleksandr Byelkin
7b5c63856b Merge branch '5.5' into 10.0 2019-02-28 21:50:00 +01:00
Oleksandr Byelkin
93ac7ae70f Merge branch '10.3' into 10.4 2019-02-21 14:40:52 +01:00
Vladislav Vaintroub
c9b9d9f515 MDEV-18506 MSI can't be built if MFC package is not installed with Visual Studio 
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.
 2019-02-07 16:46:39 +01:00
Oleksandr Byelkin
65c5ef9b49 dirty merge 2019-02-07 13:59:31 +01:00
Marko Mäkelä
a249e57b68 Merge 10.1 into 10.2 
Temporarily disable a test for
commit 2175bfce3e
because fixing it in 10.2 requires updating libmariadb.
 2019-02-03 17:22:05 +02:00
Marko Mäkelä
213ece2f2e Merge 10.1 into 10.1 
This is joint work with Oleksandr Byelkin.
 2019-02-02 13:00:15 +02:00
Oleksandr Byelkin
a3df9bcadc Merge branch '5.5' into 10.0 2019-01-28 10:36:12 +01:00
Vladislav Vaintroub
235374aee3 MDEV-18254 upgrade HeidiSQL to 9.5 2019-01-15 18:44:03 +01:00
Marko Mäkelä
dde2ca4aa1 Merge 10.3 into 10.4 2018-11-19 20:22:33 +02:00
Vladislav Vaintroub
a93ac8d95f MDEV-16448 mysql_upgrade_service remove my.ini variables that are no more valid 
MDEV-16447 incorporate Innodb slow shutdown into mysql_upgrade_service.exe
 2018-11-15 18:03:30 +01:00
Vladislav Vaintroub
f4cdf90d73 MDEV-17279 Windows : link C runtime dynamically 
Changed the build to use /MD flag so that DDL version of C runtime is used.

To make sure MariaDB is always runnable on target system, include
redistributable CRT libraries into installer.

For MSI package, use Microsoft's merge modules.
For ZIP  use "applocal" approach,i.e place redistributable dlls
into the bin directory of the package(via InstallRequiredSystemLibraries
cmake module) The space overhead of libraries in negligible, ~ 3MB unpacked.

There are 2 cases, where we still link C runtime statically

- Upgrade wizard, it uses MFC, and we link statically to avoid
redistribute also whole MFC (for this single application, does not
make much sense).

- MSI installer's custom action dll wixca.dll.Here, we need static link
so that MSI won't fail on a target system that does not have VC++2015
runtime already installed.
 2018-10-09 08:42:48 +01:00
Sergei Golubchik
57e0da50bb Merge branch '10.2' into 10.3 2018-09-28 16:37:06 +02:00
Vladislav Vaintroub
4a026596f5 MDEV-15088 Lighter version of Windows Zip distributions 
Added forgotten code signing command.
 2018-09-18 21:30:03 +01:00
Vladislav Vaintroub
f0ee8496d2 MDEV-15088 Lighter version of Windows Zip distributions 
Add new target win_package, that produces
a) light ZIP (no test suite, no sql-bench, no debugsymbols)
b) debug symbols ZIP
 2018-09-14 20:54:54 +01:00
Sergei Golubchik
fac3e575b2 fix third-party tool packaging on Win 2018-08-13 13:30:32 +02:00
Sergei Golubchik
6b53f9d781 MDEV-16662 CMake warnings: CMP0026 2018-08-12 11:37:42 +02:00
Vladislav Vaintroub
5a61fa9882 MDEV-16345 : No upgrade wizard in 10.3 in Windows packages. 
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-
 2018-05-30 21:37:51 +00:00
Vladislav Vaintroub
18e8d420b7 Feedback plugin - MSI installation checkbox switched to OFF again. 
It was on for alpha stages of 10.3, and now we're past that.
 2018-04-12 16:50:33 +01:00
Sergei Golubchik
2732fcc608 Merge branch 'bb-10.2-ext' into 10.3 2018-02-23 08:43:34 +01:00
Sergei Golubchik
b8af22af15 Merge branch '10.2' into bb-10.2-ext 2018-02-22 19:29:52 +01:00
Vladislav Vaintroub
e2ac8d3ff1 Windows : Fix /permissive- compile error 2018-02-21 16:33:55 +00:00
Vladislav Vaintroub
56e7b7eaed Make possible to use clang on Windows (clang-cl) 
-DWITH_ASAN can be used as well now, on x64

Fix many clang-cl warnings.
 2018-02-20 21:17:36 +00:00
Vladislav Vaintroub
0ea45725d8 Fix 2 more VS2015 warnings 2018-02-19 15:22:24 +00:00
Marko Mäkelä
b006d2ead4 Merge bb-10.2-ext into 10.3 2018-02-15 10:22:03 +02:00
Alexander Barkov
3cad31f2a7 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2018-02-08 19:06:25 +04:00
Vladislav Vaintroub
53476abce8 Windows, compiling : use /permissive- switch to improve conformance 
fix a couple "initialization skipped by goto" and other new errors.
 2018-02-07 20:22:30 +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
Otto Kekäläinen
c9c28bef3c Minor spelling fixes in code comments, docs and output 
This commit does not touch any variable names or any other actual code,
and thus should not in any way affect how the code works.
 2018-01-12 16:49:02 +02:00
Marko Mäkelä
6dd302d164 Merge bb-10.2-ext into 10.3 2018-01-11 19:44:41 +02:00
Vladislav Vaintroub
919169e1f9 Fix warning 2018-01-08 17:01:55 +00:00
Alexander Barkov
835cbbcc7b Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 
TODO: enable MDEV-13049 optimization for 10.3
 2017-10-30 20:47:39 +04: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ä
4e1fa7f63d Merge bb-10.2-ext into 10.3 2017-09-01 11:33:45 +03: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
Marko Mäkelä
57fea53615 Merge bb-10.2-ext into 10.3 2017-07-07 12:39:43 +03:00
Sergei Golubchik
f6633bf058 Merge branch '10.1' into 10.2 2017-07-05 19:08:55 +02:00
Marko Mäkelä
2a3fe45dd2 Remove XtraDB 
The XtraDB storage engine was already replaced by InnoDB
and disabled in MariaDB Server 10.2. Let us remove it altogether
to avoid dragging dead code around.

Replace some references to XtraDB with references to InnoDB.

rpl_get_position_info(): Remove.

Remove the mysql-test-run --suite=percona, because it only contains
tests specific to XtraDB, many of which were disabled already in
earlier MariaDB versions.
 2017-06-21 13:44:16 +03: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ä
3d615e4b1a Merge branch 'bb-10.2-ext' into 10.3 
This excludes MDEV-12472 (InnoDB should accept XtraDB parameters,
warning that they are ignored). In other words, MariaDB 10.3 will not
recognize any XtraDB-specific parameters.
 2017-06-02 09:36:04 +03: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
Vladislav Vaintroub
20ae591abd Make feedback plugin ON by default, for pre-release 2017-04-13 21:39:05 +02:00
Alexander Barkov
e2fc1f0ad4 Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 2017-04-13 07:12:50 +04: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
9764efe52c Windows packaging cleanup- get rid of "Monty Program AB" in installation 
registry keys.

This is safe to do before first prerelease of new version is available,
otherwise it would break upgrades
 2017-04-05 22:13:37 +00: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
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
Vladislav Vaintroub
55b3c84492 Small mysql_install_db.exe fixes 
- Use lc-messages-dir instead of deprecated --language when running mysqld in bootstrap mode.
- Add some verbosity to mysql_install_db.exe when it runs in course of MSI installation.
 2013-05-09 22:21:07 +02:00
Vladislav Vaintroub
8d75f11a67 MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even if there are upgradable instances (i.e windows service of lower MariaDB/MySQL version) 
The main  reason for he error is misplaced ADD_DIRECTORY in top-level CMakeLists.txt.
ADD_DIRECTORY(win/packaging) was places before win/upgrade_wizard, and MSI was not able to detect that  upgrade wizard was built, and thus excluded upgrade wizard entirely.
 2013-04-30 00:29:47 +02:00
Vladislav Vaintroub
0b034c1b2c Fix to handle CMake component names with dash in the name, when producing MSI package. 
Rename connect_engine component back to connect-engine.
 2013-04-19 18:45:54 +02:00
Vladislav Vaintroub
4a3e22c430 Fix MSI package creation for connect engine. 
Also, do not use /MP option when compiling CONNECT (incompatible with COM #import directive)
Also, fix ODBC_LIBRARY to be a list on Windows, not string with spaces inside.
 2013-04-17 07:44:49 -07:00
Sergei Golubchik
ab83952f29 10.0-base merge 2013-01-31 09:48:19 +01:00
Sergei Golubchik
aca8e7ed6b 5.3 merge 2013-01-15 19:07:46 +01:00
Igor Babaev
1ef07d0845 Merge 10.0-base -> 10.0. 
Also fixed a bug in sql_update.cc: the code of mysql_update() lacked
a call of set_statistics_for_table().
 2013-01-10 22:33:23 -08:00
Sergei Golubchik
4f67a14700 5.2->5.3 merge 2013-01-10 15:40:21 +01:00
Vladislav Vaintroub
6e7e3f80ee MDEV-3993 - add MSI installer option to set character-set-server=utf8 2013-01-01 15:33:25 +01:00
Vladislav Vaintroub
3c987667d9 merge 2012-12-21 15:19:08 +01:00
Vladislav Vaintroub
7885b38cbb Support VS2012. Exclude compiler-defined symbols from being exported by mysqld.exe 2012-12-21 15:17:26 +01:00
Vladislav Vaintroub
dbb8d954fd Trigger pusbuild build 2012-11-11 10:58:52 +01:00
Sergei Golubchik
9a64d0794c 5.3 merge 2012-08-27 18:13:17 +02:00
unknown
f090677383 Merge from 5.2. 2012-08-24 15:39:34 +02:00
Vladislav Vaintroub
f024e0d5e9 MDEV-484 : allow compilation/packaging on Windows with newly released VS2012 2012-08-24 15:30:05 +02:00
Vladislav Vaintroub
afedd72e22 MSI package: always install new component "Common" (currently consists of charset directory) 2012-05-30 20:20:54 +02:00
Sergei Golubchik
867ce618cb merge 2012-05-05 14:59:44 +02:00
Sergei Golubchik
44cf9ee5f7 5.3 merge 2012-05-04 07:16:38 +02:00
Vladislav Vaintroub
e3ffaed147 support same version upgrade for MSI 2012-05-04 03:51:30 +02:00
Vladislav Vaintroub
6920491587 merge 2012-05-02 17:04:28 +02:00
Vladislav Vaintroub
feb4776ecf MDEV233 - Support Wix3.6 for MSI 2012-04-25 15:30:19 +02:00
Vladislav Vaintroub
e13e93cb0b merge 2012-04-17 01:03:10 +02:00
Vladislav Vaintroub
2004bd1736 merge 2012-04-16 23:35:38 +02:00
Vladislav Vaintroub
5af60b5ed4 fix compiler warnings 2012-04-16 23:31:33 +02:00
Vladislav Vaintroub
6d22c2e73a merge 2012-04-16 17:41:43 +02:00
Vladislav Vaintroub
4da30b3e3d MDEV-221 - Properly escape command line when starting mysql_install_db 
since password characters can contain quotes or spaces.

The proper quoting method for command line arguments used here was  extracted from
http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx

Additionally, mysql_install_db.exe now passes root password to "mysqld.exe --bootstrap"
 in hexadecimal form, to handle potential special chars inside password string literal.
 2012-04-16 15:28:33 +02:00
Vladislav Vaintroub
f18514df2e Add minimal clarication about 'root' user to the installer UI 2012-04-15 01:21:18 +02:00
Igor Babaev
5d954e7cd0 Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
unknown
5338a28912 Merge 5.2->5.3 2012-03-14 13:58:18 +02:00