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
