summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKargatum <dowlandtop@yandex.com>2021-07-27 00:34:06 +0700
committerGitHub <noreply@github.com>2021-07-27 00:34:06 +0700
commit70a8066ab0cc556cadbe50992b297b7bb754aa98 (patch)
treead75fd913c846883341e7fb71aad71392202188f
parente37dba8df649be2f616d1846cf41e226c27a46ba (diff)
feat(Cmake/MySQL): add support MariaDB 10.6 (#7113)
Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
-rw-r--r--.github/SECURITY.md1
-rw-r--r--src/cmake/macros/FindMySQL.cmake2
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 64d409d458..4f3e9e6248 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -26,6 +26,7 @@ Versions of MariaDB:
| MariaDB Version | Supported |
| --------------- | ------------------ |
+| 10.6 | :white_check_mark: |
| 10.5 | :white_check_mark: |
| 10.4 | :white_check_mark: |
| 10.3 | :white_check_mark: |
diff --git a/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake
index ae7d09ddd0..29916463c4 100644
--- a/src/cmake/macros/FindMySQL.cmake
+++ b/src/cmake/macros/FindMySQL.cmake
@@ -28,7 +28,7 @@ endif(WIN32)
# Find MariaDB for Windows
if (WIN32)
# Set know versions MariaDB
- set(_MARIADB_KNOWN_VERSIONS "MariaDB 10.5" "MariaDB 10.4" "MariaDB 10.3" "MariaDB 10.2")
+ set(_MARIADB_KNOWN_VERSIONS "MariaDB 10.6" "MariaDB 10.5" "MariaDB 10.4" "MariaDB 10.3" "MariaDB 10.2")
# Set default options
set(MARIADB_FOUND_LIB 0)