From d46194044ba61ece43081618c10fbc283b56cc5d Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Sun, 8 Aug 2021 18:47:18 +0000 Subject: databases/mariadb103-server: Security update to 10.3.31 Security: 38a4a043-e937-11eb-9b84-d4c9ef517024 MFH: 2021Q3 --- .../mariadb103-server/files/patch-storage_innobase_snappy.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake') diff --git a/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake b/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake index 42c80e08d04a..9e8fc040616c 100644 --- a/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake +++ b/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake @@ -1,6 +1,6 @@ ---- storage/innobase/snappy.cmake.orig 2017-05-14 23:13:18 UTC +--- storage/innobase/snappy.cmake.orig 2021-08-02 10:58:58 UTC +++ storage/innobase/snappy.cmake -@@ -17,12 +17,17 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING +@@ -17,13 +17,18 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING MACRO (MYSQL_CHECK_SNAPPY) IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO") @@ -14,11 +14,12 @@ + SET(HAVE_SNAPPY_H 1) + ENDIF() + CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB) -+MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ") ++#MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ") IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H) + SET(HAVE_INNODB_SNAPPY TRUE) ADD_DEFINITIONS(-DHAVE_SNAPPY=1) - LINK_LIBRARIES(snappy) + LINK_LIBRARIES(${SNAPPY_LIBRARY}) ELSE() IF (WITH_INNODB_SNAPPY STREQUAL "ON") - MESSAGE(FATAL_ERROR "Required snappy library is not found") + MESSAGE(FATAL_ERROR "Required snappy library is not found") -- cgit v1.2.3