C/C 3.3

85c0f4d2 · Sergei Golubchik · c1e3fc0e · 85c0f4d2 · 5e94e7c2
Commit 85c0f4d2 authored May 30, 2022 by Sergei Golubchik
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cmake/build_configurations/mysql_release.cmake cmake/build_configurations/mysql_release.cmake +2 -0

libmariadb libmariadb +1 -1

No files found.
--- 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 "")

--- a/libmariadb @ 5e94e7c2
+++ b/libmariadb @ 5e94e7c2
-Subproject commit ade9bb9c3ef5f28a4f076ed3afa455975a8e5ab4
+Subproject commit 5e94e7c27ffad7e76665b1333a67975316b9c3c2