summaryrefslogtreecommitdiff
path: root/databases/mysql57-server/files/patch-cmake_ssl.cmake
diff options
context:
space:
mode:
authorUser Joneum <joneum@joneumbox.org>2023-11-16 20:03:22 +0100
committerJochen Neumeister <joneum@FreeBSD.org>2023-11-16 20:08:39 +0100
commitcc257a5eaf1f5ea45513df8d46bc60db9ea5b908 (patch)
treed5af9b293df6a1733f68f81083952365764379ff /databases/mysql57-server/files/patch-cmake_ssl.cmake
parentsysutils/plasma5-powerdevil: Implement support for backlight(8) (diff)
databases/mysq57-{client, server}: Update to latest release 5.7.43
Bugs Fixed Group Replication: After one machine halted and restarted in a three-node MySQL InnoDB Cluster, one node failed to start; after restarting all nodes, the cluster shut down unexpectedly. Our thanks to Zetang Zeng for the contribution. (Bug #34976442) Fortified parsing of the network packet data sent by the server to the client. (Bug #35374491) Some floating-point literals were not always handled correctly. (Bug Executing a query with an implicit aggregation should return exactly one row, unless the query has a HAVING clause that filters out the row, but a query with a HAVING clause which evaluated to FALSE sometimes ignored this, and returned a row regardless. (Bug #14272020) During optimization, range-select tree creation uses logic which differs based on the left-hand side of the IN() predicate. For a field item, each value on the right-hand side is added to an OR tree to create the necessary expression. In the case of a row item comparison (example: WHERE (a,b) IN ((n1,m1), (n2, m2), ...)), an expression in disjunctive normal form (DNF) is needed. A DNF expression is created by adding an AND tree with column values to an OR tree for each set of RHS values, but instead the OR tree was added to the AND tree causing the tree merge to require exponential time due to O(n2) runtime complexity. (Bug Changelog: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-43.html Sponsored by: Netzkommune GmbH
Diffstat (limited to 'databases/mysql57-server/files/patch-cmake_ssl.cmake')
-rw-r--r--databases/mysql57-server/files/patch-cmake_ssl.cmake17
1 files changed, 8 insertions, 9 deletions
diff --git a/databases/mysql57-server/files/patch-cmake_ssl.cmake b/databases/mysql57-server/files/patch-cmake_ssl.cmake
index 0e70d693a90d..a82dbb94680a 100644
--- a/databases/mysql57-server/files/patch-cmake_ssl.cmake
+++ b/databases/mysql57-server/files/patch-cmake_ssl.cmake
@@ -1,6 +1,6 @@
---- cmake/ssl.cmake.orig 2019-12-06 10:41:47 UTC
-+++ cmake/ssl.cmake
-@@ -150,22 +150,12 @@ MACRO (MYSQL_CHECK_SSL)
+--- cmake/ssl.cmake.orig 2023-11-10 17:37:52.213133000 +0100
++++ cmake/ssl.cmake 2023-11-10 17:50:19.620626000 +0100
+@@ -232,30 +232,21 @@ MACRO (MYSQL_CHECK_SSL)
MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
ENDIF()
@@ -22,10 +22,8 @@
- ENDIF()
IF(OPENSSL_INCLUDE_DIR)
- # Verify version number. Version information looks like:
-@@ -193,9 +183,10 @@ MACRO (MYSQL_CHECK_SSL)
- )
- SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "")
+ FIND_OPENSSL_VERSION()
+ ENDIF()
- IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
- ADD_DEFINITIONS(-DHAVE_TLSv13)
@@ -37,11 +35,12 @@
IF(SOLARIS)
SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
ENDIF()
-@@ -203,7 +204,13 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -263,8 +254,13 @@ MACRO (MYSQL_CHECK_SSL)
IF(OPENSSL_INCLUDE_DIR AND
OPENSSL_LIBRARY AND
CRYPTO_LIBRARY AND
-- OPENSSL_MAJOR_VERSION STREQUAL "1"
+- (OPENSSL_MAJOR_VERSION STREQUAL "1" OR
+- OPENSSL_MAJOR_VERSION STREQUAL "3")
+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+ )
+ SET(OPENSSL_FOUND TRUE)