From 91c3d99804e4154b87440712f8c6a5fee04c3dd0 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 13 Dec 2019 11:23:04 +0100 Subject: tokudb: fix to compile with gcc 9.2.0 --- storage/tokudb/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'storage/tokudb') diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 9bff7d4729f..ed802307519 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -30,6 +30,12 @@ IF (HAVE_WVLA) SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-vla") ENDIF() +CHECK_C_COMPILER_FLAG("-Wno-address-of-packed-member" HAVE_NO_ADDRESS_PACKED) +IF(HAVE_NO_ADDRESS_PACKED) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-address-of-packed-member") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-address-of-packed-member") +ENDIF() + ############################################ SET(TOKUDB_VERSION "tokudb-7.5.7") SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md" PARENT_SCOPE) -- cgit v1.2.1 From 794911a27a14ea83eda054cf34d94b43191aa19e Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 13 Dec 2019 11:23:29 +0100 Subject: tokudb: disable check_huge_pages_in_practice() crashes on Debian 10 --- storage/tokudb/ft-index/portability/huge_page_detection.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'storage/tokudb') diff --git a/storage/tokudb/ft-index/portability/huge_page_detection.cc b/storage/tokudb/ft-index/portability/huge_page_detection.cc index ca428987486..ea0eb568e4c 100644 --- a/storage/tokudb/ft-index/portability/huge_page_detection.cc +++ b/storage/tokudb/ft-index/portability/huge_page_detection.cc @@ -120,6 +120,7 @@ static bool check_huge_pages_config_file(const char *fname) static bool check_huge_pages_in_practice(void) // Effect: Return true if huge pages appear to be defined in practice. { + return false; // disabled, doesn't seem to work on newest distros #ifdef HAVE_MINCORE #ifdef HAVE_MAP_ANONYMOUS const int map_anonymous = MAP_ANONYMOUS; -- cgit v1.2.1