499 Commits

Author SHA1 Message Date
f1102da37a Merge branch '11.8' into 12.0 2025-05-22 09:22:55 +02:00
40c5b62531 Fix remaining typos 2025-04-29 11:18:00 +10:00
a8d4642375 Merge branch '10.11' into 11.4 2025-04-26 10:53:02 +02:00
11324875b4 MDEV-33474 Windows packaging - install runtime dependencies
Use CMake 3.21 (semi)automatic dependency resolution to install server
and plugin dependencies (DLLs).

This is especially useful with 3rd party dependencies, such as Curl, zlib
etc
2025-04-16 13:22:28 +02:00
b005b6097f Cleanup CMake code (Windows-specific)
Prepare for a more modern CMake version than the current minimum.

- Use CMAKE_MSVC_RUNTIME_LIBRARY instead of the custom MSVC_CRT_TYPE.
- Replace CMAKE_{C,CXX}_FLAGS modifications with
  add_compile_definitions/options and add_link_options.
  The older method already broke with new pcre2.
- Fix clang-cl compilation and ASAN build.
- Avoid modifying CMAKE_C_STANDARD_LIBRARIES/CMAKE_CXX_STANDARD_LIBRARIES,
  as this is discouraged by CMake.
- Reduce system checks.
2025-04-04 08:58:40 +02:00
5f7c2a617f Fix typos in C comments in miscellaneous files 2025-03-24 13:36:28 +11:00
7d657fda64 Merge branch '10.11 into 11.4 2025-01-30 12:01:11 +01:00
e69f8cae1a Merge branch '10.6' into 10.11 2025-01-30 11:55:13 +01:00
066e8d6aea Merge branch '10.5' into 10.6 2025-01-29 11:17:38 +01:00
fafa10dbc4 update HeidiSQL to 12.10
also, switch to https
2025-01-28 19:31:29 +01:00
b53b81e937 Merge 11.2 into 11.4 2024-10-03 14:32:14 +03:00
12a91b57e2 Merge 10.11 into 11.2 2024-10-03 13:24:43 +03:00
63913ce5af Merge 10.6 into 10.11 2024-10-03 10:55:08 +03:00
7e0afb1c73 Merge 10.5 into 10.6 2024-10-03 09:31:39 +03:00
78e640ea3e MDEV-34808 Update HeidiSQL to v12.8 2024-09-27 14:44:20 +02:00
2c0b7ff2b4 Windows : support Wix toolset 3.14
Chocolatey package manager installs this one.
2024-09-27 14:43:32 +02:00
cbe13e9ec0 Windows installer - ignore hashicorp-key-management, even if it was built.
Fixes MSI installer.
Do not install hashicorp-key-management, as also we would need to install
dependencies, in this case libcurl. For that, MDEV-33474 needs to be fixed
first.
2024-09-04 13:24:21 +02:00
99b370e023 Merge branch '11.2' into 11.4 2024-05-21 19:38:51 +02:00
f9807aadef Merge branch '10.11' into 11.0 2024-05-12 12:18:28 +02:00
11aeef2aa2 MDEV-33420: HASHICORP_KEY_MANAGEMENT fails on Windows with libcurl installed
- When `libcurl` is installed in path out of default path, like on
Windows, `include_directories` failed to find `curl/curl.h`.
- Fix `cmake` by using modern syntax with imported target and
`find_package`
- Fix warnings treated as the errors
  - Remove `HASHICORP_HAVE_EXCEPTIONS` macro and related code
- Add package to `Server` component in Windows
- Tested with `$ ./mysql-test/mtr --suite=vault`
- Closes PR #3068
- Reviewer: <wlad@mariadb.com>
            <julius.goryavsky@mariadb.com>
2024-04-18 01:45:24 +02:00
01f6abd1d4 Merge branch '10.4' into 10.5 2024-01-31 17:32:53 +01:00
b62f25c650 MDEV-26579 fixup 2024-01-26 00:15:13 +01:00
0f59810b99 MDEV-26579 Support minor MSI in Windows installer.
With this patch, 4-component MSI version can be used, e.g by setting
TINY_VERSION variable in CMake, or by adding a string, e.g
MYSQL_VERSION_EXTRA=-2
which sets TINY_VERSION to 2, and also changes the package name.

The 4-component MSI versions do not support MSI major upgrades, only minor
ones, i.e do not reinstall components, just update existing ones based
on versioning rules.

To support these rules, add DefaultVersion for the files that won't
otherwise be versioned - headers, static and import libraries,
pdbs, text - xml, python and perl scripts Also silence WiX warning
that MSI won't store hashes for those files anymore.
2024-01-26 00:15:13 +01:00
193b22d822 Merge 11.2 into 11.3 2024-01-05 14:20:35 +02:00
5be8b13735 Merge 10.11 into 11.0 2024-01-03 15:55:17 +02:00
bdf65893dd Merge 10.6 into 10.11 2024-01-03 15:37:57 +02:00
8bd5a3de7f Merge 10.5 into 10.6 2024-01-03 14:24:47 +02:00
3a3a4f044f Merge 10.4 into 10.5 2024-01-03 12:07:51 +02:00
1b747ffd05 MDEV-33115 Update HeidiSQL to 12.6 2023-12-23 09:13:07 +01:00
7b842f1536 Merge 11.2 into 11.3 2023-10-27 10:48:29 +03:00
be24e75229 Merge 10.11 into 11.0 2023-10-19 08:12:16 +03:00
d5e15424d8 Merge 10.6 into 10.10
The MDEV-29693 conflict resolution is from Monty, as well as is
a bug fix where ANALYZE TABLE wrongly built histograms for
single-column PRIMARY KEY.
Also includes a fix for safe_malloc error reporting.

Other things:
- Copied main.log_slow from 10.4 to avoid mtr issue

Disabled test:
- spider/bugfix.mdev_27239 because we started to get
  +Error	1429 Unable to connect to foreign data source: localhost
  -Error	1158 Got an error reading communication packets
- main.delayed
  - Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED
    This part is disabled for now as it fails randomly with different
    warnings/errors (no corruption).
2023-10-14 13:36:11 +03:00
5fc19e7137 MDEV-32252 addendum - refactor CPackWixConfig.cmake
Refactor CPackWixConfig.cmake so that it complains about unknown CPack
components.

This would prevent missing components,or discrepancy between MSI and ZIP
content, whenever new components are added or renamed.

Also, remove some old stuff, and use macros add_component_group() and
add_component() to reduce the verbosity.
2023-10-04 09:30:01 +02:00
8044606a67 MDEV-32252 "Backup Utilities" not available to install on windows
Commit 738d4604b7 changed component name
from "backup" to "Backup". Use the new name now.
2023-09-27 15:00:27 +02:00
6a470db552 Merge 10.5 into 10.6 2023-09-14 15:25:53 +03:00
cb1965bd9d Merge branch '10.4' into 10.5 2023-09-14 16:30:11 +10:00
5fe8d0d559 MDEV-31315 Add client_ed25519.dll to the list of plugins shipped with HeidiSQL
There is a list of plugins in the WiX configuration file for HeidiSQL,
and the installer only installs DLLs from that list although the HeidiSQL
portable archive may include other plugins.

This commit adds client_ed25519.dll to this list and also rearranges
the list alphabetically, so it is easier to verify its contents
2023-09-13 11:17:27 +10:00
dbab3e8d90 Merge 10.6 into 10.8 2023-02-10 13:43:53 +02:00
6aec87544c Merge 10.5 into 10.6 2023-02-10 13:03:01 +02:00
c41c79650a Merge 10.4 into 10.5 2023-02-10 12:02:11 +02:00
8dab661416 MDEV-30624 HeidiSQL 12.3 2023-02-09 11:28:55 +01:00
88c35781cc Merge 10.7 into 10.8 2023-01-13 11:11:04 +02:00
5aa58a0d39 MDEV-30374 Windows, MSI - do not cache error, if install directory changes.
If installation directory is not empty, MSI would shows a popup informing
user about it. The error message is stored as MSI property
INSTALLDIRERROR.

Fixed the bug that the error was not cleared, when the user changes
directory in installer UI.
2023-01-12 15:14:37 +01:00
b7ffccf49b Merge branch '10.7' into 10.8 2022-05-18 13:26:48 +02:00
f027c1217b MDEV-28471 mysql_install_db.exe does not work with --innodb-page-size=64K
The error message "InnoDB: innodb_page_size=65536 requires innodb_buffer_pool_size >= 20MiB current 10MiB" is the relevant one.

The root cause:
mysql_install_db bootstraps with --innodb-buffer-pool-size=10M.
Small bufferpool is here by design - bootstrap should succeed,
even if there is not much RAM available, bootstrap does not need that much
memory.

For pagesize 64K specifically, Innodb thinks it needs a larger bufferpool,
and thus it lets the bootstrap process die (although the expected behavior
in this case would be to adjust value, give warning and continue)

The workaround:
- pass --innodb-buffer-pool-size=20M, which is suitable for all page sizes.
- check the same limit in MSI custom action.

Also, the patch adds mtr test for 64K page size.
2022-05-13 14:17:58 +02:00
eb25f47423 Merge branch '10.7' into 10.8
# Conflicts:
#	storage/innobase/btr/btr0pcur.cc
#	storage/innobase/log/log0log.cc
2022-02-17 12:43:29 +01:00
7aa09af488 Fix whitespaces 2022-02-14 12:04:50 +01:00
e9e6b23987 MDEV-27828 : Windows - major MSI upgrade fails, complaining that install directory not empty 2022-02-14 12:04:08 +01:00
4fb2cb1a30 Merge branch '10.7' into 10.8 2022-02-04 14:50:25 +01:00
8c457dad48 MDEV-27546 MSI should fail if INSTALLDIR is a non-empty existing directory
Make installer fail if INSTALLDIR exists.
In UI mode, show a popup and disable "Next" button until install root is
corrected
2022-01-31 20:10:08 +01:00