From 85c0f4d2de4a0dc6efe36bb16cfe932b90e30a95 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 30 May 2022 16:04:09 +0200 Subject: [PATCH] C/C 3.3 --- cmake/build_configurations/mysql_release.cmake | 2 ++ libmariadb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 7411627685e..3a081073f72 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -106,6 +106,7 @@ ELSEIF(RPM) SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "") SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "") SET(WITH_PCRE system CACHE STRING "") + SET(CLIENT_PLUGIN_ZSTD OFF) IF(RPM MATCHES "fedora|centos|rhel") SET(WITH_INNODB_BZIP2 OFF CACHE STRING "") SET(WITH_INNODB_LZO OFF CACHE STRING "") @@ -124,6 +125,7 @@ ELSEIF(DEB) SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "") SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "") SET(WITH_PCRE system CACHE STRING "") + SET(CLIENT_PLUGIN_ZSTD OFF) SET(WITH_INNODB_BZIP2 OFF CACHE STRING "") SET(WITH_INNODB_LZMA OFF CACHE STRING "") SET(WITH_INNODB_LZO OFF CACHE STRING "") diff --git a/libmariadb b/libmariadb index ade9bb9c3ef..5e94e7c27ff 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit ade9bb9c3ef5f28a4f076ed3afa455975a8e5ab4 +Subproject commit 5e94e7c27ffad7e76665b1333a67975316b9c3c2